On branch master
	deleted:    res/sprites/boss2.png
	modified:   src/entities/Collision.java
	new file:   src/test/CollisionTest.java
Merge branch 'master' of http://github.com/Quaitgor/space_shooter