pre merge commit
Merge branch 'master' of github.com:shawnhanna/HTMLGameMaker