Awesome
Merge branch 'master' of https://github.com/Khazuar/JumpingJack

Conflicts:
	JumpingJack/JumpingJack/Game1.cs