Unsure
Merge branch 'master' of https://github.com/Squarn/Squarn.github.io

Conflicts:
	Project1.html
	normalize.css