My first commit
second commit
merging various files from my 2 diff machine
for win
Merge branch 'master' of https://github.com/ktuteja/project1

Conflicts:
	first.txt