changes in README file using branch feature
Merge branch 'feature'
updated description
updated description
Merge branch 'feature'

Conflicts:
	README
added maven settings