checkout
Fixed merge conflict
added some stuff
Merge branch 'master' into pair
added logic
Merge pull request #11 from zachgersh/pair

Added correct answers