Some search stuff
Merge branch 'developmentAlpha' of https://github.com/jnthntatum/CollabMe into developmentAlpha

Conflicts:
	collabme_rails/db/schema.rb
Based search for eerything enabled