pre-ugly
Merge branch 'master' of https://github.com/wpears/BathCat

Conflicts:
	BathCat.js
fixed conflict
moving along.. almost done with profile