took up turbolinks
Version 1 of most models
fixed merge conflicts
Merge branch 'master' of github.com:pdarden/band_cupid into kb_branch
updated branch with master
Basic controller for user profile
Merge pull request #3 from pdarden/user_profile_controller

Basic controller for user profile
updated the band profiles controller
Merge pull request #4 from pdarden/kb_branch

Kb branch
Need to fix issue with user_profiles_controller
Added geocoder in band_profile model
Merge pull request #5 from pdarden/geocoder

Geocoder
updated with merge'free' conflicts
updated the bands and user controller
Merge pull request #6 from pdarden/kb_branch

Updated the controller for users and bands
updated the rails version
Merge pull request #7 from pdarden/kb_branch

updated the rails version
Fixed routes in nav bar and enable artist profile
Add profile picture for artist page
Merge pull request #8 from pdarden/artist_profile_pic

Add profile picture for artist page
Added aws, need to fix carrierwave_direct