Added FactoryGirl and Devise gems, added Sign Up/In links and account creation
Fixing merge conflicts