commiting nothing
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex
added the key to env
fixed some merging conflict
Merge pull request #2 from oconn/alex

Alex