Fixed the mock server so that it will now load new messages added to it properly after the program is closed.
Merging with files pushed from home
Merge pull request #196 from iameric1986/master

Fixed the mock server so that it will now load new messages added to it properly after the program is closed.
testing UI add questions
Merge pull request #201 from tbrockman/master

remove upc object from viewquestion
Merge branch 'master' into newBranch
UI testing dialogbox opened
Commenting now works
Merge pull request #203 from jivedesign/master

Commenting now works
testing the UI stuff and josh stuff merged
Merge pull request #202 from rjynn/newBranch

New branch
adding UI test to add question
Merge pull request #204 from rjynn/master

adding UI test to add question
UI test WORKS :D
Merge remote-tracking branch 'upstream/master'
Merge pull request #205 from rjynn/master

UI testing works :D
User lists work
Merge pull request #206 from cchan5/master

User lists work
added some comments to testing
Merge remote-tracking branch 'upstream/master'