fix(server): Add connectTimeoutMS option for Mongo Connection
Merge pull request #291 from forrestbthomas/master

fix(server): Add connectTimeoutMS option for Mongo Connection
fix(server): Set connectTimeoutMS back to default
Merge pull request #293 from forrestbthomas/master

fix(server): Set connectTimeoutMS back to default
style(public): Add announcement bar
fix(public): Fix announcement bar
fix(public): Fix announcement bar
Merge branch 'update'

Conflicts:
	public/dist/main.min.css
	public/index.html
Merge branch 'master' of https://github.com/forrestbthomas/javascript-battle-website into update

Conflicts:
	public/css/main.css
	public/dist/main.min.css
Merge branch 'update'
Merge pull request #295 from forrestbthomas/master

style(public): Add announcement bar
style(announcement): Change announcement bar
Merge pull request #296 from forrestbthomas/master

style(announcement): Change announcement bar