Add contributing file (no current issue number to assign to)
Add code of conduct (no issue number currently)
Delete 乔梁.txt

remove testing file.
Update README.md

Fixing grammar
Merge branch 'patch-1' of github.com:jimarnold/gocd into jimarnold-patch-1

Conflicts:
	README.md
Merge pull request #126 from hammerdr/code-of-conduct

Add code of conduct (no issue number currently)
Merge pull request #125 from hammerdr/contributing-file

Add contributing file (no current issue number to assign to)
#NA - Adding a test to verify non UTF-8 character file names

Adding a test to verify the presence of non UTF-8 character filesname while MDU polls a repository. After this, we can remove the file named '乔梁.txt' from the root of the repository.
Merge pull request #129 from xiaods/patch-1

Delete 乔梁.txt
Merge remote-tracking branch 'upstream/master'
Merge pull request #143 from sachinsudheendra/master

#NA - Adding a test to verify non UTF-8 character file names
#147 - removing unused jar in server/webapp/WEB-INF/lib
#147 - removing jruby-1.7.3
#147 - adding jruby-1.7.11.

# install buildr & sass
export GEM_HOME=`pwd`/tools/jruby-1.7.11
export GEM_PATH=`pwd`/tools/jruby-1.7.11/lib/ruby/gems/shared/
./tools/jruby-1.7.11/bin/jruby -S gem install buildr --no-ri --no-rdoc
./tools/jruby-1.7.11/bin/jruby -S gem install sass --no-ri --no-rdoc
#147 - fixes for jruby 1.7.3 to 1.7.11 upgrade.

changed paths for ./tools/jruby to ./tools/jruby-1.7.11 except in cruise-modules.rb in which
./tools/jruby (1.3.1) is used to run rspec tests. Since that is the only usage of ./tools/jruby now
we should remove it when we migrate rspec tests to latest jruby/rails.
#130 - Remove RubyRuntimeFinder. Not used.
Merge pull request #153 from srinivasupadhya/master

#130 - Remove RubyRuntimeFinder. Not used.