made a change to a.txt
changed a.txt
fixed conflict
''
Merge pull request #5 from dcs24/master

Testing
Merge pull request #4 from vkwagner/master

fixed a.txt
Testing my commit and push.
Added NETWORK_STATE and INTERNET permissions
Added code to request from PHP script. ZFR complete.
Merge pull request #13 from bkng/master

Poll database (via PHP script) and display contents. ZFR milestone complete.
Test added message to a.txt
Merge pull request #14 from Reptarsrage/master

Yep.
Basic UI Functionality.
Added Question, Solution, CategoryEnum, DifficultyEnum classes, with their fields and getters. Added QuestionServiceInterface. Still need to flesh out Question and Solution constructors.
added the uml diagrams to the repo
code review changes
Merge pull request #15 from dcs24/master

Basic Data Objects and QuestionServiceInterface. Reviewed design, style, algorithms, security, error checking.
Added PaginatedResults object and Jackson JSON library
code review changes
Merge pull request #16 from bkng/master

Added PaginatedResults object and Jackson JSON library