2. Commit to development
3. test 1 changed, temp not commited
Merge branch 'development' of github.com:fuartfl/testf

Conflicts:
	test1.txt