Init
Merge branch 'master' of https://github.com/johnrazeur/DefHosting

Conflicts:
	.gitignore
Init