Changes to Dia1.dia giving merge conflicts
Trying to fix merge conflicts
Merging new files from parent
made Main activity list view with populated list. Needs menu. Partially made MainListAdapter - the custom list adapter for Main View
Merge pull request #83 from jivedesign/master

made Main activity list view with populated list. Needs menu. Partially ...
Merge pull request #82 from tbrockman/master

Merge changes to respond activity xml
added a lot of icons in all the resolutions
Merge pull request #84 from jivedesign/master

added a lot of icons in all the resolutions
changed the icons in view question activity xml's
Merge pull request #85 from jivedesign/master

changed the icons in view question activity xml's
Changed some of the model's code and created test suites to test the functionality of the  models
Pulled from master
Implemented save/load methods for LocalDataManager
Merge pull request #86 from iameric1986/master

Changed the models and created test suites for them
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
Merge pull request #87 from cchan5/master

Implemented save/load methods for LocalDataManager
added addQbutton
Merge pull request #88 from rjynn/master

added addQbutton
created empty button method
Merge https://github.com/CMPUT301F14T03/lotsofcodingkitty