tried type: preSelectChoice
commit
Merge branch 'master' of https://github.com/yueranyuan/hw5-team12

Conflicts:
	apache-solr-3.6.2/example/data/index/segments.gen