changes

changes to controller, migrations, selection2, and script-cards.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/selection2.blade.php