Fixed Conditions
Merge branch 'master' of https://github.com/thejosh223/cs198mojo