timer stuff
stupid merge
Merge branch 'master' of https://github.com/theindexer/flag_game