before upstream merge
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
Add migration file to allow Hstore in databse
create setlist model and associated files
change service/setlist to service/setlistfm
implement new data saving structure
refactor code - add private method
update SongsController to reflect latest change in linking videos to concert_song
videos in concert page now displayed by setlist order
housekeeping
Begin refactor of setlist search
- Breaking logic out into individual methods based on data type of each setlist
remove binding pry from searches controller
fix merge conflict
Merge branch 'raderj89-chore/refactor-setlist-search'
1. Change services/Setlist to services/Setlistfm to avoid naming conflict
add setlistfm file
resolve merge conflict
refactor show.html.erb by moving code to helper
Merge pull request #34 from tihuan/feature/store_concerts_in_search_page

Feature/store concerts in search page and display videos by setlist order
Fixed merge conflict in schema.rb

Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb