WIP
Merge branch 'master' into jake_judy/homepage
user / survey links functional
Merge pull request #4 from masidonion/jake_judy/homepage

Jake judy/homepage