Q1 Review
Merge branch 'master' of https://github.com/jannunzi/CS1500