bopit added
Merge branch 'master' of https://github.com/jhil/bopit

Conflicts:
	client/index.sass
	client/main/index.jade
	client/main/main.sass