a commit number 4
another commit
Merge branch 'dev' of https://github.com/Fanaloop/new_project2 into dev

Conflicts:
	devstuff/a_test_file.txt