change the parameter name.
change the parameter name.
Merge remote-tracking branch 'origin/merge_challenge_api' into merge_challenge_api

Conflicts:
	routes.js
Merge pull request #177 from LazyChild/merge_challenge_api

change the parameter name of getChallenge API.