Merge pull request #15 from ChrisBoesch/master

update
resume badge challenge from profile page
Merge pull request #403 from ruijunhuang2010/master

update