weird gemfile lock issue.
Merge branch 'master' of github.com:BYWallace/supatravel