lulz
Merge branch 'master' into how-to-jumping

Conflicts:
	public/fail/25.gif
Merge branch 'how-to-jumping'