Adding Simple Search Feature
Clearing up simple_search pull request
Merge branch 'master' into simple_search

Conflicts:
	app/models/simple_search.rb
	app/views/tracks/search.html.erb
Changing Placeholder to Title Search
Adding Error Messaging to Search Form
Merge pull request #9 from stujo/simple_search

Adding simple search