move model
js evaluation is now working on test scenario /evaltest
merge conflict
Merge branch 'master' of https://github.com/jasongoodwin/Balloons.IO