Added runline_test and Gemfile.lock to gitignore
Merged conflicts