John's part
Merge branch 'master' of https://github.com/sammo3182/PS_TeamA