testing merge
Merge branch 'master' of https://github.com/toatts/fantasy_football

Conflicts:
	ff_draft_organizer.py
v0.6