trying auth stuff
merge
more merge
html stuff
ugh
Merge branch 'master' of https://github.com/helenhe/cs3240-f14-team02

Conflicts:
	sprint1/models.pyc
	sprint1/views.pyc