dev
dev1
dev2
dev3
dev4
Merge branch 'dev'

Conflicts:
	HelloGit.txt