added some stuff
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex
added some stuff
Merge pull request #13 from oconn/alex

Alex incoming conflicts