update controlelr
Merge pull request #7 from oconn/users

update controlelr
Merge branch 'master' of https://github.com/oconn/picture_parser_2 into alex