cleanup
changed games to use real data
Merge branch 'master' of https://github.com/g-palmer/hashtags
score finally incrementing.  finally.
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	controllers/gameController.js
Merge branch 'master' of https://github.com/g-palmer/hashtags
dummygame2
splice to slice
Merge branch 'master' of https://github.com/g-palmer/hashtags
hashtag slice and myplayer on continued
only emit submitted event when submitted
working on scoreboard
Merge branch 'master' of https://github.com/g-palmer/hashtags
added some hashtergs to the templates
Merge branch 'master' of https://github.com/g-palmer/hashtags
?
Merge branch 'master' of https://github.com/g-palmer/hashtags
fixed merege
video playing in all views now. judge can also select videos again