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
Add functionality of followers and following
  - Still need to fix button to unfollow
  - User pages now display all of their followers and who they are
    following
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
working on inviting facebook friends
housekeeping
added experimetantal fonts, began styling navbar, created directories for new assets and integrated additional stylesheets via bourbon (in application.css)
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