before acts as taggable
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
merge
merge