Collisions

I redid collisions and it works as far as I can tell. I added
CollisionsTest2.java because for some reason I couldn't use
CollisionsTest.java? Added 2 more tests that I used during my debugging
process (so by no means exhaustive testing).