/api/shower/friends/week
Merge branch 'master' of https://github.com/shirhatti/showersense_website
Merge remote-tracking branch 'upstream/master'