0.3.1.4

Tail Whip
Merge branch

Conflicts:
	js/game/checkpoint.js