Should get a few more tests correct now
Merge branch 'master' of https://github.com/Toad2186/cs164