Merge branch 'master' of C:\intS\Platformer with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/pdereg/Platformer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/Renderer.java