Cosmetic changes
Merge branch 'master' of https://github.com/cgeyer22/THE-ISD

Conflicts:
	Site.master
(1) Merge branch 'master' of https://github.com/cgeyer22/THE-ISD

Conflicts:
	Site.master