Css troubles that will need to be solved another way but...
Merge branch 'master' of heroku.com:topekacb-test

Conflicts:
	public/assets/css/site.css
Merge branch 'master' of http://github.com/nxidis/topekacb
Merge branch 'master' of http://github.com/nxidis/topekacb
Adoptee matching work in progress