Merge pull request #1 from zhbanton/upload_images

User can add an avatar to their account
Merge pull request #2 from zhbanton/upload_images

Fix naming error on images controller
Merge branch 'master' of github.com:zhbanton/photo_mixer into upload_images