Player now collects stuff
Merge branch 'master' of github.com:Nukesor/ggj14

Conflicts:
	src/systems/event/playerControlSystem.lua