Merge branch 'dev' of https://github.com/3divs/OpenRecess

Conflicts:
	public/stylesheets/style.css
new styling commits
css stylin