added correct and skip buttons for testing
fix merge conflix
Merge branch 'master' of https://github.com/jbowens/taboo-ios