this is where stuff gets weird
Added 511 logo
Merge branch 'master' of https://github.com/jlev/arrival-time

Conflicts:
	static/styles/style.css
	static/styles/style.less
	templates/index.html