Merge branch 'master' of https://github.com/jeetaz/temp

Conflicts:
	gotcha.txt
Merge branch 'master' of https://github.com/jeetaz/temp
reseting head
Merge branch 'master' of https://github.com/jeetaz/temp
branch test