deleted old Gemfile.lock.orig
added Gemfile.lock
compass fix
merge branch 'live' of github.com:heliogabal/mcf_theme into live