gitignore and gemfile stuff
merging onto webserver