adding keyboard cat
Merge branch 'master' of https://github.com/josmas/pet_owner_finder

Conflicts:
	public/js/app.js
bug fixes