Alt branch commit
Second commit of the alt branch
3rd commit of alt branch
more
Merge branch 'dev1'

Conflicts:
	GitTesting/src/colors.txt
	GitTesting/src/fruits.txt