Collision works
Merge remote-tracking branch 'origin/master' into tobias3
Shitloads of stuff out in the unit class
Merged with master
stuff dies
MErged awesomeness