Some changes to code
Merge finished
Comiiiittt
Merge branch 'master' of github.com:shawnhanna/HTMLGameMaker