cleanup
Merge branch 'master' of github.com:billinghamj/placekitty

Conflicts:
	templates/layout.erb