Added game over text for collision and some better graphics
Merging in master
Fixed a few merge issues