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
tags on poemwall seems to work
fixed tags!
merge
merge
merge
facebook fixed
Merge branch 'master' of github.com:pjsim/codetry into pjsim-master

Conflicts:
	app/views/home/index.html.erb
	app/views/poems/_form.html.erb
	app/views/poems/show.html.erb
fix home page
update design for home page editing, banning, show banned state on button, add banning to admin panel
fix poem form
Merge branch 'master' of github.com:JurgensSmit/codetry into JurgensSmit-master

Conflicts:
	app/views/users/show.html.erb