Updated my gitignore
Merge master to local repo
Update Gemfile