Merge pull request #286 from Yahkob/UIEnhancement

feature(public): reposition and account for media change
Merge pull request #287 from Yahkob/UIEnhancement

feature(public): fix bug from previous commit position is now correct
feature(server.js): Add announcement endpoint
Merge pull request #288 from gjtrowbridge/add-announcement

feature(server.js): Add announcement endpoint
(refactor): switch leaderboard to promises, return json in announcement
Don't return id for announcement object
Merge pull request #289 from gjtrowbridge/adjust-announcement

refactor(server.js): Adjust announcement to return JSON object
fix/feature(.ejs): Fix link bug in general.ejs, add link to codetester
site
Merge pull request #290 from gjtrowbridge/add-link-code-tester

fix/feature(.ejs): Fix link bug in general.ejs, add link to codetester
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