init
edits
edits
edits
edits
edits
edits
edits
edits
edits
edits
edits
clean up
added rails-api demo to show cors for hacker news
Work in progress
Merge branch 'master' of github.com:ga-wdi-boston/wdi_7_js_demo_ajax

Conflicts:
	ajax-demo/demo.html
	ajax-demo/server/server.rb
	task-manager/client/js/app.js
Merge branch 'master' of github.com:gbanis/wdi_7_rails_lab_hn_api