Merge branch 'ironfly' of https://github.com/laxaurus/finopt.git into ironfly

src/sh/base_messaging.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
+<<<<<<< HEAD
+FINOPT_HOME=~/l1304/workspace/finopt-ironfly/finopt/src/
+=======
 #FINOPT_HOME=~/l1304/workspace/finopt/src/
 FINOPT_HOME=~/ironfly-workspace/finopt/src/
+>>>>>>> branch 'ironfly' of https://github.com/laxaurus/finopt.git
 ROOT=$FINOPT_HOME
 FINDATA=$ROOT/../data 
 SRC=$ROOT