local styles
Merge branch 'master' of https://github.com/dgordienko/schoolroom3g

Conflicts:
	schoolroom3g/public/stylesheets/style.css