Rock blown to pieces
Merge branch 'master' of https://github.com/guslerde/TickTock2
Had to merge for some reason but kept all the new stuff