+ Solved conflict manually in header + Officialese redesign inspired by http://jondot.github.io/sneakers/