General Refactor
Merge branch 'master' of https://github.com/Onaga/Webpage-beta

Conflicts:
	about.php
	index.html