lots!
Merge branch 'master' of https://github.com/ijmccallum/myWebsite

Conflicts:
	www/notes/index.php
Conflict resolved, CSS combined