Merge branch raketask of github.com:willhall88/Angry-Kitty
Merge branch raketask of github.com:willhall88/Angry-Kitty
merge party completed
Merge branch master of github.com:willhall88/Angry-Kitty
fixed all merge errors
fixed some merge issues with the master branch. everything up to date