whatever
working?Merge branch 'master' of https://github.com/julierich1211/KenPhilJulie

Conflicts:
	index.html
	js/app.js