assignment 2
Merge branch 'master' of https://github.com/InternetBully/DangKenny_CSC11_2438209
merging swag