Added in happiness randomization
Merge branch 'master' of github.com:Jdog653/CS53