Merge branch 'master' of https://github.com/jaiabhayk/clip

Conflicts:
	README