newfile
dev branch
Merge branch 'dev'

Conflicts:
	newfile