git ignore initial test configuration
Merge branch 'master' of https://github.com/allspain/fantasyfind

Conflicts:
	.gitignore