updated requirements file
gitignore file
Merge branch 'master' of github.com:xando/testmanager

Conflicts:
	.gitignore