views/home.html
Merge branch 'master' of github.com:cle1994/cmyk2014