Merge pull request #5 from ChrisBoesch/master

up to date
minor change in challenge list display
Merge pull request #207 from ruijunhuang2010/master

minor change