Merge branch 'development'
Added cats
Added even more cats! (cats2)
Added Favorite Animal to Dev Profile
Merge pull request #1 from etmoore/cats-feature

Cats feature
Merge pull request #2 from etmoore/lasers-feature

Created lasers
Merge branch 'master' into development