project 1 stuff
Merge branch 'master' of https://github.com/InternetBully/CSC-11-Project-1

bloop