testing merge
test merge
fixed the test merge
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
Merge pull request #81 from dcs24/master

Random questions
WIP: adding local UserInfo file
minor method signature change
Added UserInfo (untested)
WIP: tests for UserInfo
UserInfo implemented and tested. Will add hooks to appropriate methods in QuestionService
style fixes