update gemfile
Merge branch 'SearchUpdated' of github.com:CS169-badjr/calapps into SearchUpdated

Conflicts:
	solr/data/development/index/segments_1
	solr/data/development/spellchecker/segments_1
	solr/development/data/index/segments.gen
	solr/pids/development/sunspot-solr-development.pid