Changing c1
Committing c1
Merge branch 'dev'

Conflicts:
	c-1.txt