add jumping
Merge branch 'master' of https://github.com/arthurhatch/HackathonSpring2013

Conflicts:
	XNA/Learnification/Learnification/Learnification/Learnification/Game1.cs