before acts as taggable
Merge pull request #26 from JurgensSmit/master

Add OmniAuth Facebook
Merge pull request #27 from JurgensSmit/master

remove _url from column fields
update user profiles
Merge remote-tracking branch 'origin/master'
fix facebook login bug
facebook
omni facebook
Merge pull request #28 from teebii/master

Omni Facebook fixed
update home design
fix devise.rb conflict
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