Merge pull request #1 from oconn/users

Users
add homepage
commiting nothing
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex
add bootstrap
added the key to env
fixed some merging conflict
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
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