Turned off list bullet
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/theme.styl
Fixed amend commit