7
Merge branch 'master' of https://github.com/brameshreddy/SAMPLEGIT

Conflicts:
	ONE.txt