Removed conflict files that have come in from Dropbox.
ruby: git should ignore the vendor bundle folder.
Merge branch 'master' of github.com:robert-impey/CodingExperiments