Revert ba53a8c..6ba2e06

This rolls back to commit ba53a8c312def0c9cda2c19e7988f7c80d663ea4.
Revert 96696a1..f86ea5e

This rolls back to commit 96696a1e19ade93b8fc08305a2be53c6a157ca43.
Merge branch 'master' of https://github.com/webmedia-seven/crazy-cats