Finished a bunch of smaller tasks in preparation for user testing
Merge branch 'master' of https://github.com/yjm607/CS408--Critter-Friends
Adding small changes