Merge conflict on GlobalData
Merge branch 'master' of github.com:pangel/ens2012-pj
Merge branch 'master' of github.com:pangel/ens2012-pj
Fixing
fixing again
updating