first attempt of OO javascript
Merge branch 'master' of https://github.com/davidkam/starmaker

Conflicts:
	scripts/global.js