more code for testing

not finished, but records of more attempts at testing
developing forms, modifying templates for forms

I haven't finished it all, but I need to commit these files to my branch
to go to another's branch to look at their implementation
sql files for testing
student text choice additions

there are now forms for the students textual response to be obtained
Response model change

changed "order" attribute to "convoOrder" to make SQL commands
functional. I believe "order" is an SQL keyword
Merge remote-tracking branch 'origin/jasons_branch' into merged_kenw

Conflicts:
	vagrant/simcon/forms.py
removed git stuff from forms.py

in the merge, git added some incorrect code to forms.py. this should fix
it.
new login file?

I merged to the master branch, and now it's claiming I'm adding this
file. if it makes my syncs work, I'll "add" it.
"adding" additions to urls.py

merging urls.py file
adding new urls/forms
Merge branch 'merged_kenw' of https://github.com/djorda9/Simulated-Conversations into merged_kenw

Conflicts:
	vagrant/simcon/urls.py