current game alert stuff
Merge branch 'master' into style-updates
fixed an error
Merge pull request #45 from patricksimpson/style-updates

Style updates