develop 7
develop 8
feature 4
Merge branch 'feature'

Conflicts:
	file1.h