Merge pull request #13 from paulhyunkim/tsangbranch

MOST UPDATED FILE JUNE 4th 2014
fixed landing page routes, fixed sign-up page
loads random songs into player
landing page routes
resolved merge conflicts
Merge pull request #16 from paulhyunkim/stylebranch

Stylebranch
resolved merge conflicts
fixed a div sizing