Initial commit
Add .env and Amazon SWS gems
Added Devise
Merge branch 'master' of github.com:zhbanton/photo_mixer

Conflicts:
	Gemfile.lock
Added User login to view
Resolved conflict in gemfile.lock
Added image model
user can view all images on home page
new images can be created, just using url
comments can be viewed and created
Added score to images and comments
Created Vote model
Added Votable module to Image and Comment models
Images and comments can be upvoted and downvoted
Shared voting view for comments and images refactored into partial
changed User.images to User.uploaded_images
User can add an avatar to their account

*Avatar can be added on account creation
*Avatar can be added or changed through account edit page
Fix naming error on images controller
Users can upload images which all display at the images index
Users can now add a username at registration/sign-up and sign in with either email or username.