Merge remote-tracking branch 'origin/lucas'
Divide game into fields
Pointer conflict
Collision ready
Merge remote-tracking branch 'origin/lucas'
Merge remote-tracking branch 'origin/lukas'
Fixed wall collision
Added splitting
Merge remote-tracking branch 'origin/jonas'
removed grid
Merge remote-tracking branch 'origin/lukas'
comments
qDebug and log removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Revenge_of_the_Penguins/inventory/inventory.cpp
Comments
More Comments
merged bäm
small fixes
layout fix