views.py updates
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	sprint1/forms.pyc
	sprint1/models.pyc
	sprint1/urls.pyc
	sprint1/views.pyc
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	sprint1/models.py
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	cs3240project/__init__.pyc
	cs3240project/settings.pyc
	cs3240project/urls.pyc
	cs3240project/wsgi.pyc
	db.sqlite3
	sprint1/__init__.pyc
	sprint1/admin.pyc
	sprint1/forms.pyc
	sprint1/models.py
	sprint1/models.pyc
	sprint1/urls.pyc
	sprint1/views.pyc
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	cs3240project/__init__.pyc
	cs3240project/settings.pyc
	cs3240project/urls.pyc
	cs3240project/wsgi.pyc
	db.sqlite3
	sprint1/__init__.pyc
	sprint1/admin.pyc
	sprint1/forms.pyc
	sprint1/models.py
	sprint1/models.pyc
	sprint1/urls.pyc
	sprint1/views.pyc
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	cs3240project/__init__.pyc
	cs3240project/settings.pyc
	cs3240project/urls.pyc
	cs3240project/wsgi.pyc
	db.sqlite3
	sprint1/__init__.pyc
	sprint1/admin.pyc
	sprint1/forms.pyc
	sprint1/models.pyc
	sprint1/urls.pyc
	sprint1/views.pyc
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02

Conflicts:
	db.sqlite3