Nic's changes
Nic's todo
Merge branch 'master' of https://github.com/timdiacon/barnes-webb

Conflicts:
	dev/css/style.css
	dev/js/adoption.js
	dev/js/app.js
	dev/sass/style.scss