Added Gemfile.lock. Fixed bug with missing parameter on function lasWon
removed Gemfile.lock from commit
Fixed conflicts with develop