feed has tabs for user and subscribed music
styling
moar styles
merge conflicts
user page has content
user has photos and styling
added see more link to activity page
resolve merge conflict for activity tabs
Merge pull request #30 from allisonlarson/sub_wireframes

Sub wireframes