...
Merge branch 'master' of https://github.com/xmduhan/pitchersite

Conflicts:
	pitcher/migrations/0001_initial.py