committing to new branch
testing again
Merge branch 'dev'

Conflicts:
	newfile.txt