have data being loaded in yay
fixes merge conflict in App.js
Sets it up so json is being brought in via ajax