Update
Merge branch 'master' of https://github.com/Incenium/platformer

Conflicts:
	include/Texture.hpp