Initial commit
Update README.md
c
Merge remote-tracking branch 'origin/master'
c
c
c
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	README.md
	pom.xml