Trying to modify nav bar
merge conflicts
Merge pull request #36 from paulhyunkim/stylebranch

Stylebranch
displays city and state info, displays total track time
Merge branch 'master' of https://github.com/paulhyunkim/Play-It-Forward
added inbetween sections on welcomepage
css, buttons,like song button
resolving conflicts
Merge pull request #37 from paulhyunkim/aarontsangbranch

Aarontsangbranch
commiting user.js before overwrite
Merge branch 'master' of https://github.com/paulhyunkim/Play-It-Forward
like button now adds song but wrong (next) track
commiting before overwrite
resolving merge conflicts