Initial commit including some junk
Adding ignore file
removing log files
Merge branch 'master' of https://github.com/bhorsoft/pytest

Conflicts:
	.gitignore