edited fake search results for add friends
caption bar appears on editing screen
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
merge
completed all functionality for captions