Tails for pails
Merge branch 'master' of https://github.com/Epiphane/GGJ2014

Conflicts:
	GGJam-android/assets/levels/level1.tmx
Merge branch 'master' of https://github.com/Epiphane/GGJ2014