Changes on Domains.
Merge branch 'master' of https://github.com/Skiri-ki/GGJ-2014