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

Start stuff
Merge branch 'master' of github.com:torgeha/FlapMyFish into vikasBranch