Last minute additions
Last minute additions
Merge branch 'master' of https://github.com/etinlb/COGS120