Merge pull request #3 from CMPUT301F14T03/master

updating to newest fork
Changed the TestMakeFavorite so that it doesn't just do the same as the SaveFavorites test. Added a "favorited" boolean to the Question class so you don't have to compare it to the favorites list to find out if an element is favorited (seemed like a good thing to have for the future, also adds a distinction between the two test cases.)
Merge pull request #68 from tbrockman/master

Some brief changes
UML
Merge pull request #69 from pachalad/master

UML
Added assert messages
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
Merging from master