Merge pull request #2 from oconn/alex

Alex
working on migration
solved some merge conflicts in schema.rb
Merge pull request #3 from oconn/models

Models
merge
fix conflict
preparing for merge conflicts
fixed some merges
working model, migration, and seed file for picture
Merge pull request #4 from oconn/models

working model, migration, and seed file for picture
add image upload
fix merge confilicts
add new pic
Merge pull request #5 from oconn/users

Users
getting ready for another merge conflict
merging
sending conflicts