socket
deployed
Merge remote-tracking branch 'origin/am/ui' into canzhiye
Merge pull request #5 from BerkeleyBaes/am/ui

Create custom button views for expanding
running locally again…
Change background color of welcome screen
update welcome label
Fix duplicate folder references #xcodesucks
Merge pull request #6 from BerkeleyBaes/canzhiye

Canzhiye
Remove ivars
Set up navigationbar for the view during music mode