init
Merge branch 'master' of github.com:camme/spytest

Conflicts:
	.gitignore