saving before pull. Don't think I changed much.
Merge branch 'master' of https://github.com/lpaulsen333/cat
some minor fixes and UI tweaks
Merge branch 'master' of https://github.com/lpaulsen333/cat