Trying to modify nav bar
merge conflicts
css, buttons,like song button
resolving conflicts
Merge pull request #37 from paulhyunkim/aarontsangbranch

Aarontsangbranch