Merge pull request #9 from paulhyunkim/dinnabranch

Dinnabranch
link_to calls song#create
Added handle bars
resolved conflicts
added manual geolocation to user page
Display songs thru handlebars
attempting to resolve merge conflict
Merge pull request #10 from paulhyunkim/aaronbranch

Updated with handlebars + maps
nested routes (user,songs)