Inital commit.
Merge branch 'master' of https://github.com/StuntsPT/unicorns_and_cotton_candy