Trying to merge
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project
Replies to favs now being retrieved from storage, but replies to all favs are being displayed