thing
Merge branch 'master' of https://github.com/youralien/booltheweb
Merge branch 'master' of https://github.com/youralien/booltheweb into navbar

Conflicts:
	views/ask.jade