stuffz
This merge is necessary
Merge branch 'master' of https://github.com/Gnistrande/ClickIt