A bit nerged
Merge branch 'master' of https://github.com/ToxicWar/Moodcatcher