Merge branch 'master' of github.com:TeamDruid/project_gift
small changes
forgot to commit. Added DialogFragment for a favorrites menu in actionBar. Added single item view for favorite items. Added layouts for both of those.
added button to singleItemView to add item to favorites, wired up button, added method to FavoritesDialog to add item to favorites arrayList
not sure
fixed some bugs with favorites
Fixing merge conflicts
Merge pull request #55 from acdevine89/fixingDan

Dan you are the worst.