Working on a completely new style
Merge branch 'master' of github.com:thytanium/mariale