Merge pull request #27 from marklc44/master

s3 junk
fix userid bug in challenge show
Merge branch 'master' of https://github.com/mjminc/project2