Changed update from per Frame to per 30 mSec
rename file
remove umlaut from names
Merge branch 'master' into collision

Conflicts:
	game/Player.cpp
Added destroy function of the player (have to be rendered later)
Merge branch 'collision' of github.com:LukasKalbertodt/cg-14 into collision
center marker added
add center-marker
Merge branch 'collision' of github.com:LukasKalbertodt/cg-14 into collision
Implemented function to place Blocks
add inventory shaders
add PlayerInventory
 add texture for inventory
implement inventory
Merge branch 'master' into collision

Conflicts:
	Makefile
	game/CraftGame.cpp
retina fix ausgebaut
abgebaute blöcke werden nun nicht mehr angezeigt
inventory number
implement inventory number
fix wrong order of triangle of texture