feature1 added
Merge branch 'feature1'

Conflicts:
	main.cpp