Merging.
Merge branch 'master' of github.com:Seich/GAMEON2014

Conflicts:
	source/Player.hx