collisioncontroller++
add -A
Merge pull request #6 from torgeha/start_stuff

Start stuff