added search feature
Merge branch 'master' of github.com:klreierson/tickerface

* 'master' of github.com:klreierson/tickerface:
  Updated seeds.rb
  initial commit
  Initial commit
  Finished converting project from sinatra to rails
  Initial commit

Conflicts:
	.gitignore
	.rails_footnotes
	Gemfile
	Gemfile.lock
	README.md
	README.rdoc
	Rakefile
	app/assets/images/.keep
	app/assets/images/browse.jpg
	app/assets/images/browse_button.png
	app/assets/images/header.png
	app/assets/images/jonah.gif
	app/assets/images/large-div.png
	app/assets/images/light_honeycomb_@2X.png
	app/assets/images/logo-nav.png
	app/assets/images/signin.jpg
	app/assets/images/signin_button.png
	app/assets/javascripts/application.js
	app/assets/javascripts/main.js.coffee
	app/assets/javascripts/plugins.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/normalize.css
	app/controllers/application_controller.rb
	app/controllers/concerns/.keep
	app/controllers/main_controller.rb
	app/helpers/application_helper.rb
	app/helpers/main_helper.rb
	app/mailers/.keep
	app/models/.keep
	app/models/company.rb
	app/models/concerns/.keep
	app/models/profile.rb
	app/views/layouts/application.html.erb
	app/views/main/company.html.erb
	app/views/main/index.html.erb
	app/views/main/profile.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/filter_parameter_logging.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/rails_footnotes.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20130802031220_add_persons_table.rb
	db/schema.rb
	db/seeds.rb
	lib/assets/.keep
	lib/tasks/.keep
	log/.keep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	test/controllers/.keep
	test/controllers/main_controller_test.rb
	test/fixtures/.keep
	test/helpers/.keep
	test/helpers/main_helper_test.rb
	test/integration/.keep
	test/mailers/.keep
	test/models/.keep
	test/test_helper.rb
	vendor/assets/javascripts/.keep
	vendor/assets/javascripts/jquery-1.9.1.min.js
	vendor/assets/javascripts/modernizr-2.6.2.min.js
	vendor/assets/stylesheets/.keep