Merge pull request #15 from joelwass/joelTest

Joel test
'derp'Merge branch 'joelTest' of https://github.com/joelwass/dumpster into testingLogan

to testingLogan
Merge pull request #16 from joelwass/joelTest

Joel test
Merge pull request #17 from joelwass/joelTest

working commit, still trying to parse wikipedia correctly with json in o...
merging with lasting push
working implementation of YJCAPViewController.m, correctly pulls different answer depending on question asked
Merge pull request #18 from joelwass/workingAP

Working APViewController
working randomization of button question text
Merge pull request #19 from joelwass/workingRando

working randomization of button question text
working button recognition
Merge pull request #20 from joelwass/testingLogan

working button recognition
update on comments, nothing here really