remove = from jade
change layout.jade
fix formating
merge index.jade conflicts