Merge pull request #1 from CMPUT301F14T03/master

Updating with master
3 test classes left before things should be able to run, restored some
files.
Update FavoritesTest.java
Merge pull request #57 from tbrockman/master

going to bed