fix userid bug in challenge show
Merge branch 'master' of https://github.com/mjminc/project2
message avatars and default avatars set up
Merge pull request #28 from rasbabbo/master

added nav bar functionality, and updates,
Merge branch 'master' of https://github.com/mjminc/project2
fix sites controller @user error
Merge pull request #29 from marklc44/master

fix userid bug in challenge show