Change of Branch
Laptop >Feature
Merge branch 'new-product-feature' of
https://github.com/Thinkenterprise/git-sample-two.git into
new-product-feature

Conflicts:
	sample-git/src/de/thinkenterprise/NewFeature.java