Fix pre and haml conflict
Merge branch 'master' of https://github.com/borisyankov/binary-static

Conflicts:
	src/templates/haml/home/styles.html.haml