Merge pull request #2 from autorepo/development

Merge pull request #1 from autorepo/master
Merge pull request #3 from autorepo/development

test file created by dev
Merge pull request #4 from autorepo/master

test merge into master