added password reset/ added remember me
merge conflict
fixed up mailer authentication to use gmail account
merge conflict
fixed bug caused by changing current_user helper method to appication controller method: @current_user not being set in views
fixed 'not being logged in on signup' bug
added password confirmation when updating user
removed profile fields from user table. Added profiles MVC
updated user profiles
fixed error in seeds.rb
added dragonfly for weapon mvc
fixed errors in routes for weapon uploading
added to .gitignore
Merge branch 'hidalgo' of github.com:christiannaths/designbattle
updated Gemfile.lock
hides crud links when viewing other users weapons
added nav link to layout for weapons
getting back to work
no changes
conflict resolution