initial commit with bootstrap
fixed merge conflict
adding initial form styling
finished first version of landing page form
fixed gemfile.lock merge conflicts
tweaked landing page. added rough placeholders for results page
Merge branch 'master' into front-end
adapted page width and tweaked results page
hard coded results page with placeholders
added full background image to landing page
added jquery background transitions to landing page
added slideToggle function for form on landing page
tweaked some resposnive CSS issues
added individual layout for home and playlist pages
fix merge conflicts
front end integration of gig info disply
add player to front end
add link embedding for track
Merge branch 'master' into integration
Updated Gig mock in search controller tests