Crude collisions done
Merge branch 'master' of https://github.com/james7132/RIP2014-HW1