adding json file, someone can delete the csv file, adding javascript functions, updated controller
resolved scripts.js conflict, removed capybara
update front end
pushing index and styles.css
Merge branch 'master' of https://github.com/whyu/wdi_project_2
adding font