pushing changes to master after presentation
Merge branch 'develop' of github.com:macewanCMPT395/Team2 into develop