hw1- deleting Gemlock
add Gemfile
hw1- fixed merge conflicts