modified master
wil lthis commit to master?
added feature 1
modified feature1
Merge branch 'feature4' of https://github.com/przemekk13/helloworld into feature4

Conflicts:
	template.txt