design v.-1
Merge branch 'master' of https://github.com/Nic0w/MiamMiam
Merging update