Merged
Merge branch 'develop' of https://github.com/Bevinsky/site into develop

Conflicts:
	public/css/default.css