Initial Commit
Merge branch 'master' of https://github.com/gitJeffMoore/MavenTestProject
Merge branch 'master' into develop

Conflicts:
	pom.xml