conflict
Merge branch 'master' of https://github.com/NoviumDesign/Arti.Zen

Conflicts:
source/index.html.haml
source/stylesheets/application.css.sass
conflict