weeks done this afternoon
Merge branch 'master' of https://github.com/NathanTheGr8/PersonalWebPage

Conflicts:
	.idea/workspace.xml