added choices.
added choices.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	db.sqlite3
Added some form processing.