First commit
Merge branch 'master' of https://github.com/loganyott/loganyott

Conflicts:
	sites/default/default.settings.php