updates
Merge branch 'master' of github.com:easel/gamestats

Conflicts:
	.gitignore
	requirements.txt