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
fixed the join game bug
fixing merge conflicts
css changes
fixed multiple registration problem for games
styling changes
updated readme
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
styling changes
Adding heroku specific configs
merging
styling of Create games incomplete
added more styling changes
styling of Create games incomplete with changes
Merge branch 'dev' of https://github.com/3divs/OpenRecess

Conflicts:
	public/stylesheets/style.css
still styling
still styling 2
new styling commits
add login icon