Add Song and Add Friend Buttons
Add Friend doesnt work yet
Merge branch 'master' of https://github.com/TheRealNadav/Mocks.git
Merge branch 'master' of https://github.com/TheRealNadav/Mocks.git