merge
fix conflict
preparing for merge conflicts
fixed some merges
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
Merge pull request #6 from oconn/alex

Alex
update controlelr
Merge pull request #7 from oconn/users

update controlelr
dont know what i'm committing
Merge branch 'master' into models
merging conflicts again
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex
Merge pull request #8 from oconn/alex

Alex merging conflicts