modified models for user and poem to add acts_as_votable"
ban confirm button added
authorization for ban button added
before acts as taggable
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
create user profile page
design update and fix garbage url additions from social share buttons
add avatar uploading
bug fix remove facebook button and wrap write poem button in auth? test
merge to master
views and language tags working so far
clean up user profiles
update page design
Merge branch 'master' of github.com:pjsim/codetry into pjsim-master2

Conflicts:
	Gemfile
	app/views/poems/new.html.erb
	config/routes.rb
tags on poemwall seems to work