Copied over some code from another repository
Merge branch 'master' of https://github.com/edasaur/Website