Raghu's second commit
some other dude's commit
just another change
Merge branch 'master' of https://github.com/The-WebOps-Club/git-fundaes

Conflicts:
	mani.txt
Merge branch 'master' of https://github.com/The-WebOps-Club/git-fundaes

Conflicts:
	mani.txt
Merge branch 'master' of https://github.com/The-WebOps-Club/git-fundaes
Merge branch 'master' of https://github.com/The-WebOps-Club/git-fundaes