Day 7
Merge branch 'master' of https://github.com/Phroa/computerscience
i broke it