Merge branch 'Front-End'
Merge branch 'master' of https://github.com/AlexGoodwin/Methods