old changes and new report
merge'd
Merge branch 'master' of github.com:5-second-rule/website
Merge branch 'master' of github.com:5-second-rule/website