home.jade
git ignore
merge resolved