Inserts tag into database
Made guests able to log in via Facebook
Removed merge conflicts in gemfile.lock