point json request to heroku address
pull in Oliver's edit's
attempt to fix No 'Access-Control-Allow-Origin' header is present on the requested resource'
merge github and heroku
fix merge conflicts but have not added app/assets/javascripts/timeline.js
fix merger issue and also modify app/assets/javascripts/timeline.js
fix merge error