Nightly push
Merge remote-tracking branch 'origin/live'
Fixed .gitignore
Fixed conflict.
Database dump
Merge branch 'live' of github.com:hdlnerd/cathyscritters
Merged database
Nightly push - development branch
Merge done
Nightly push - live branch
Hand-merged live into master