Added untested blacklist feature
Merge branch 'blacklist'

Conflicts:
	app.rb