added more to the player and added basic stuff
Merge branch 'master' of https://github.com/kruegsch/IGGJ7_Laika
more on bullets and the second player controllers
Merge branch 'master' of https://github.com/kruegsch/IGGJ7_Laika

Conflicts:
	core/src/de/hamburg/laika/Laika.java
	core/src/de/hamburg/laika/player/PlayerControl.java
Merge branch 'master' of https://github.com/kruegsch/IGGJ7_Laika