Merge branch 'develop' of https://github.com/vipinngupta15/temp into develop

Conflicts:
	hi
Merge branch 'develop' of https://github.com/vipinngupta15/temp into develop