refactored js for lists by creating model and view functionality to update html without rendering when new data is generated
fixed some merge conflicts with js and html
fix merge conflicts on dashboard index and list show, js now working with views
delete list views
starting to add the delete a friend from a list
Merge branch 'master' into settling
fixed merge conflicts in dashboard index
needed to pull master
fixed friends list view
fixed divs to make page pretty
fixing merge conflicts
Update index.html.erb
Update index.html.erb
fixed indenting and div
Update show.html.erb
changed tabs
fixed functionality of settlements
fix seed file
Merge branch 'master' of github.com:island-foxes-2013/SplitAmongUs
formatted the list totals partial