Merge pull request #77 from dcs24/master

Support for categories and difficulty
cleaned up code, made it conform to style, added support for getting random questions, refactored code