Added more options for Happiness.
Merge branch 'master' of https://github.com/JordanPorter/CS3716-Game