merge?
Merge branch 'master' of https://github.com/ambeam/gamejs-project
general update