Build Challenge to upload to server
Merge remote-tracking branch 'origin/master'