premerge
Merge branch 'master' of http://github.com/shawnhanna/HTMLGameMaker

Conflicts:
	blueprints/bullet.json
	blueprints/thing.json