For our purposes, this game engine is good enough
Merge branch 'master' of http://github.com/shawnhanna/HTMLGameMaker

Conflicts:
	Engine/actionFunctions.js