Merge pull request #7 from felamaslen/fela_js

event modifications to intersection.js
Template module
Merge pull request #11 from felamaslen/wpf-template

Template module
Added units.js to _main, and modules. They contain proper unit definitions,unit test,  and unit adding methid
Added units.js to _main, and modules. They contain proper unit definitions,unit test,  and unit adding methid
Merge branch 'master' of https://github.com/felamaslen/flappyworks
Merge branch 'master' into ssm_unitystuff

Conflicts:
	js/_main.js
	js/modules/units.js
Removed idiotic useless units from global.js
Merge pull request #12 from felamaslen/ssm_unitystuff

Added units.js to _main, and modules. They contain proper unit definitio...
Merge pull request #13 from felamaslen/ssm_unitystuff

Removed idiotic useless units from global.js
Merge pull request #14 from felamaslen/fela_js

fixed global stuff
Fix syntax
fixed conflict message