DNS notes
Merge branch 'master' of https://github.com/ijmccallum/myWebsite

Conflicts:
	Site/guides/webservers.php