310714-1143

visual updated
Merge branch 'master' of https://github.com/kristdev/totem-makeup