overwrite_view_here

Here
Merge branch 'ideate' of https://github.com/jhager6/CS7460 into ideate

Conflicts:
	mysite/ideaphase/views.py