Init
Merge branch 'master' of github.com:chengyin/nbafantasy

Conflicts:
	.gitignore