final touches
Merge branch 'master' of github.com:uncreative-commons/candies