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
Remove binary diffs
Generate release notes for Sparkle

ALl our release notes were being uploading into the wrong directory. No
longer.
Merge pull request #1409 from hawkthorne/remove_diff_updates

Remove binary diffs
fixed json bug
Validate JSON files

Test that all our JSON files are valid. Fix the two files that currently
aren't. Fix #1413
Actually commit the script
Merge pull request #1411 from hawkthorne/upload_release_notes

Generate release notes for Sparkle
Merge pull request #1414 from hawkthorne/add_json_tests

Add json tests
Also check that our XML files are valid too
Run validate on all branches
Merge pull request #1416 from hawkthorne/add_json_tests

Also check that our XML files are valid too
Merge pull request #1402 from DaNiwa/bar_stuck

Fix Stuck behind a bar