solr
fix calapp

Conflicts:
	app/models/calapp.rb
application
Merge branch 'search' of github.com:CS169-badjr/calapps into search

Conflicts:
	app/models/calapp.rb
calapp