1
Merge branch 'master' of github.com:gyzerok/UPG

Conflicts:
	UPG/Game.h
Merge branch 'master' of github.com:gyzerok/UPG
Merge branch 'master' of github.com:gyzerok/UPG
Merge branch 'master' of github.com:gyzerok/UPG
Merge branch 'master' of github.com:gyzerok/UPG
commit epta