Add .gitignore file
Try not hardcoding path of gem
Address conflicts