//Updating engine
Merge branch 'master' of https://github.com/Marzac/arKalon

Conflicts:
	arKalon/sprite.h