updates
Merge branch 'master' of https://github.com/5-second-rule/website