- saving and updating your facebook friends
- pulling only wishes from your friends
- button JOIN turns to JOINED when needed
small fixes
added splash screen
Merge branch 'doug2' into master1
Revert "added splash screen"
reverted!
This reverts commit 54018e061e881b1b29f6d5dc525d34a0aa94f26c.
fix merge
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into doug
added more error checking to not break the profile page