prettier header
Merge branch 'master' of https://github.com/rschaosid/SchoolOrganizerWeb

Conflicts:
	public/stylesheets/style.css