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
Merge pull request #38 from paulhyunkim/stylebranch

Stylebranch
fixed welcome page
correct map info for each song
merge conflicts resolved
fixed city and state info pull
cleaned up code
cleaned up code
last minute session bug fix before code review
attempting to fix animations
Merge branch 'master' of https://github.com/paulhyunkim/Play-It-Forward
Merge branch 'master' into aarontsangbranch
dsstore