testing merge
test merge
fixed the test merge
Combined question and solutions into one screen. Add solution button not yet added back in.
added ant build script and updatd CodePro .pref file
Lots of cleanup. Added loading animations and error dialogs.
Merge branch 'master' of https://github.com/huskysoft/403Interviewer
Cleaned up
added loading_anim.xml
fixed linebreak concerns with if/else statements
Merge pull request #73 from codand/master

Combined questions and solutions into a single view and added loading animations
Fixed indentation in NetworkService.java and QuestionService.java.
Merge https://github.com/huskysoft/403Interviewer
Empty commit to test Jenkins
Merge pull request #75 from kevinloh/master

Fixed indentation in NetworkService.java and QuestionService.java.
added category and difficulty support
fixed code review changes
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
code review modifications