delete unused files
Merge branch 'feature/store_concerts_in_search_page'
before merge upstream
solve merge conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
housekeeping
solve merge conflict again
solve merge conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
resolve conflict
Merge branch 'test/controllers/searches_controller'
fix/searches_controller
fix/searches_controller again
resolve conflict
searches_controller tests all pass:
2 exmaples for 100% coverage
fix conflict
Merge branch 'master' into test/helpers/songs_helper
split in @songs no longer needed
Merge pull request #46 from tihuan/test/helpers/songs_helper

SearchesController, SearchesController specs, Helper specs