final commit
Merge branch 'master' of github.com:riteshsangwan/challenge-api

Conflicts:
	README.md
final commit