Removed a bunch of merge error markers.
Added bcrypt gem to gemfile.
Added bcrypt gem and ran bundle install.
Erases config/initializers/s3 file.
Replaced config/ routes with origin and upstream version.
Added a new user migration using rails cast.
Added from railscast example to models/user.rb (http://railscasts.com/episodes/250-authentication-from-scratch).
Added to the users_controller from the railscast example.
Generated a sessions controller.
Erased migrations for imagesets and comments which were in duplicate locally and not reflected in the upstream.
Did same with images migration.
Added 2 fields to user migration after fully rolling back; erased second user migration.
Successfully rolled back, deleted old devise users migration and migrated my new users migration.
Added methods from the railscast to sessions_controller.
Added helper method to ApplicaitonController to establish current user.
Removed all merge error markers from models.
Have cleaned up files to the point where the console works.
Branched off into a voting branch, now erasing all vote anything from this branch. Checkpoint for errors.
Rolled back all the way.
Deleted acts_as_votable migration