Changed some stuff
Merge branch 'master' of https://github.com/Ultramann/FanDuel

Conflicts:
	models.py