updates to this repo
Merge branch 'master' of https://github.com/WIHP/apache-settings

Conflicts:
	.DS_Store