Updates gemfile.lock file
Merge branch 'master' of github.com:GusVilla303/Clone-Wars
Merge branch 'master' of github.com:GusVilla303/Clone-Wars
Merge branch 'master' of github.com:GusVilla303/Clone-Wars
Merge branch 'master' of github.com:GusVilla303/Clone-Wars
Gets local web site working, except online_orders