2:22pm update
Merge remote-tracking branch 'origin/master'
working on friends view controller