added happiness
Merge pull request #3 from Tablesalt/fff

added happiness