some changes

Signed-off-by: Spyros Gasteratos <morfeas3000@gmail.com>
Merge branch 'new' of https://github.com/northdpole/scaling-happiness into new