testing merge
test merge
fixed the test merge
added ant build script and updatd CodePro .pref file
Merge pull request #70 from bkng/master

ant build script and updated CodePro config file
WIP: setting up Jenkins
Converted tests to use Android framework
style cleanup
Combined question and solutions into one screen. Add solution button not yet added back in.
added ant build script and updatd CodePro .pref file
Merge pull request #72 from bkng/temp

Prepare files for Jenkins
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
Merge https://github.com/huskysoft/403Interviewer
added category and difficulty support