changed stuff in file5 newbranch1
Merge branch 'newbranch1'

Conflicts:
	file5