commit
Merge branch 'master' of github.com:kinglouisxviii/Iguess

Conflicts:
	Iguess/urls.pyc
	main/models.pyc
	main/views.pyc
change indentation in views.py