modified models for user and poem to add acts_as_votable"
ban confirm button added
authorization for ban button added
added migration for boolean ban to user
added filter for banned users and auto-sign out function. over rode the devise session controller
added ban function and made poem default to order by descending created at date"
unified ban/unban function
finished admin
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/poem.rb
	app/models/user.rb
	app/views/home/index.html.erb
	db/schema.rb
merge
merge
merge
facebook fixed
update design for home page editing, banning, show banned state on button, add banning to admin panel