Merge pull request #12 from buren/test1

Test1
updated readme
readme
readme feat2
epic
Merge pull request #13 from buren/feature3

Feature3
Maven changes
Merge branch 'master' of github.com:buren/test into feature3

Merge.
Merge pull request #15 from buren/feature3

Feature3
readme
Merge pull request #16 from buren/feature4

readme
Update README.md
updated readme
Merge pull request #17 from buren/story32

updated readme
Update README.md
Updated...
Update README.md
readme
conflict
Update README.md