fixes and prettify
Merge branch 'master' of https://github.com/kennethnorman/BrotherhoodsRoundabout

Conflicts:
	br-diary.js
	br.css
	index.html