json
Merge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	js/app.js
newestattempt