Added handle bars
resolved conflicts
Display songs thru handlebars
attempting to resolve merge conflict
Merge pull request #10 from paulhyunkim/aaronbranch

Updated with handlebars + maps