Add setup file to fix well-known import issue with py.test
Add to .gitignore
Add to .gitignore
Merge branch 'add_setup_file' into develop