Added comments for master
Merge branch 'master' of https://github.com/akshat12/conflictbox

Conflicts:
	README.md