added render method to src/Main.cpp
added render method
Merge remote-tracking branch 'origin'
added render method
Merge branch 'master' of https://github.com/Incenium/platformer

Conflicts:
	include/Texture.hpp
	src/Texture.cpp