Initial installation of drupal 7
Merge branch 'master' of https://github.com/blackcoat77/d7.localhost

Conflicts:
	.gitignore