some changes
wtf
wtf
Merge branch 'master' of https://github.com/dmryan/CPSC471-Project.git