Merge branch 'master' into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
css changes
styling changes
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
styling changes
Adding heroku specific configs
merging
added more styling changes
add login icon
login page - css
moved twilio auth and secret keys into bash profile and heroku settings
Merge branch 'master' of heroku.com:openrecess

Conflicts:
	public/stylesheets/style.css
splash page changes
Merge pull request #42 from AndrewMagliozzi/master

changed the twilio account to Andrew's and hid all auth tokens
Merge pull request #41 from sellds4/master

Create games CSS adjustments and map lat/long fix
splash screen design
Merge branch 'jason' into 3divs-dev

Conflicts:
	config/games.json
	public/index.html
	public/stylesheets/style.styl
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
	routes/index.js
Minor CSS and spacing updates