Labelling addresses, adding initial happiness calculation
Fixing spelling mistake
Fixing spelling mistake (guest)
Merge with upstream
Forgot to save before merge..
Merge pull request #144 from MaciekBaron/master

Labelling addresses, adding initial happiness calculation