cleaned up logo code
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense
high scores now show in menu
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense
Fixed sidebar labels being off on a repaint
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense
Merge branch 'master' of https://github.com/TimMikeladze/js-tower-defense
cleaned up logo code
Fixed sidebar labels being off on a repaint
Added next wave greying
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense

Conflicts:
	javascripts/app/menus/sidebar.js
added id generation
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense

Conflicts:
	javascripts/app/menus/sidebar.js
some end of game logic
end of game
game over title
waves
waves
high scores and gameover screen