Worked on this with Ari
Merge branch 'master' of https://github.com/Gredoz/APCS-Homework