Updated things
Merge branch 'master' into joona

Conflicts:
	include/LD30/Entity/Player.hpp
	src/LD30/Entity/Player.cpp
Fixed merge
Merge branch 'joona'