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