spaces to tabs, stupid sublime text
temp commit
Merge branch 'master' of github.com:ftwgroup/thefoundersmarket

Conflicts:
	auction/models.py
	auction/views.py