fix broken merge
Merge branch 'master' of github.com:IMIO/cpskin.minisite