Merge branch 'master' of https://github.com/AngryStickStudios/StickFlick

Conflicts:
	src/com/AngryStickStudios/StickFlick/StickFlick.java