small change
Happiness types and mindfulness
Merge branch 'local'