added return to player init function
Merge branch 'master' of https://github.com/Incenium/platformer

Conflicts:
	src/Player.cpp