added solr gem
added solr to model Org
added thin gem
added solr search to index view, model, and controller
added solr to git ignore
fixed merge conflicts
fixed merge conflicts in view
removed content column
ignoring solr auto files from git
Merge branch 'master' of https://github.com/mule-deer-2013/OpenNGO into sunspot
Merge branch 'master' of https://github.com/mule-deer-2013/OpenNGO into sunspot
updated Org model to work with new colums
Merge pull request #10 from mule-deer-2013/sunspot

Sunspot