content and css changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.sass-cache/387be91c1f5c49d2ac843c0e8d356cdaec2a07da/style.sassc
	public/css/mediaQueries.css
	public/css/style.css
	public/css/style.css.map
	sass/style.sass
Merge branch 'master' of https://github.com/Acoli/COMP1950-final-assignment