cleaned
Merge branch 'master' into mybranch

Conflicts:
	testFile.txt
Merge pull request #1 from nickhil-revu/mybranch

Cleared code