Client Commit 2
test
test2
Merge branch 'master' of http://github.com/mzadeh/test1.git

Conflicts:
	File_c1.txt