woohoo
OK
Merge branch 'master' of github.com:julierich1211/KenPhilJulie
wha
working
Merge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	index.html
	js/kapp.js
tryagain