first commit
Merge branch 'master' of github.com:freeminder/drupal_allin

Conflicts:
	Dockerfile