Initial Commit
Merge branch 'master' of github.com:AndroidConsulting/DockerGrailsTest

Conflicts:
	README.md