dont know what i'm committing
Merge branch 'master' into models
Merge pull request #8 from oconn/alex

Alex merging conflicts
committing nothing
Merge branch 'master' into models
seed will import non-gps data
working on seeder fix for fox living next to alex
image upload functional
image upload
Merge pull request #10 from oconn/models

Models
Merge branch 'master' of https://github.com/oconn/picture_parser_2
added some stuff
Merge pull request #9 from oconn/eric

Eric
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex
nothing to commit
Merge branch 'master' into models
fixed associations
added path to picture controller when parsing
Merge pull request #11 from oconn/eric

fixed associations
Merge pull request #12 from oconn/models

Models