deleted application.css
merging upstream/master
set up backbone architecture and templates
set up backbone architecture and templates
working data model and templates
minor changes to index.html.erb
merged conflicts