Adding lines for dev2
More for dev 2
More from #dev
Merge branch 'dev2'

Conflicts:
	newfile
Merge branch 'dev'

Conflicts:
	newfile