Changes based on software engineering practices
Merge branch 'Master' of https://github.com/EdTheMan/PA1 into Master