finishes the band known as mariachi
Forgot the images!
fixes mariachi
Merge branch 'master' into vol-enemies
fixed stutter
Fix Stuck behind a bar
Merge branch 'master' of git://github.com/hawkthorne/hawkthorne-journey into bar_stuck
Merge branch 'master' into vol-enemies

Conflicts:
	src/maps/valley.tmx

update
Merge pull request #1402 from DaNiwa/bar_stuck

Fix Stuck behind a bar
If using the --level flag, set the default Gamestate.home

Fixes #1031 and #1287
Merge pull request #1417 from Protuhj/quit_to_menu

If using the --level flag, set the default Gamestate.home variable
Addresses #1031 and #1287
remove random empty file
blank space on file endings
Merge pull request #1361 from CalebJohn/vol-enemies

Mariachi Band!