blahblahblah
resolved some merge conflicts
Merge branch 'master' of https://github.com/nestorga/cs169