Merge pull request #6 from stujo/simple_search

Adding better seed data
Merge pull request #7 from stujo/simple_search

Adding Codeship
Merge pull request #8 from stujo/simple_search

Simple search
Removing search from mastare
Removing simple search from master
Merge branch 'master' into simple_search

Conflicts:
	app/models/simple_search.rb
	app/views/tracks/search.html.erb