dmfakd
Merge branch 'master' of github.com:iMillerp/SiteHorizon

Conflicts:
	index.php
kdglak