Updated and cleaned up merge conflicts and added FavoritesTest
Merge pull request #19 from cchan5/master

Updated and cleaned up merge conflicts and added FavoritesTest