updated views
Merge branch 'patrick'

Conflicts:
	term_project/DFA/views.py