Fixed my feature
Merge remote-tracking branch 'origin/master' into myfeature

Conflicts:
	git-test/src/main/java/se/altran/git/App.java
Merge branch 'myfeature' into myfeature2