removed windows gems from Gemfile.lock
Merge branch 'testing'