fixing merge conflicts

CONTRIBUTE.md

@@ -93,11 +93,11 @@ Julia Computing and New Zealand eScience Infrastructure.
 
 **Julia language consultants.** Mike Innes, Avik Sengupta
 
-**Other contributors, past and present.** Diego Arenas, Edoardo Barp,
-Gergö Bohner, Michael K. Borregaard, Valentin Churavy, Harvey
-Devereux, Mosè Giordano, Thibaut Lienart, Mohammed Nook, Annika
-Stechemesser, Ayush Shridar, Yiannis Simillides
-
+**Other contributors, past and present.** Dilum Aluthge, Diego
+    Arenas, Edoardo Barp, Gergö Bohner, Michael K. Borregaard,
+    Valentin Churavy, Harvey Devereux, Mosè Giordano, Thibaut Lienart,
+    Mohammed Nook, Piotr Oleśkiewicz, Julian Samaroo, Ayush Shridar,
+    Yiannis Simillides, Annika Stechemesser
 
 
 

Project.toml

@@ -26,15 +26,18 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
-MLJBase = "0.2.6"
+CSV = "0.5"
+MLJBase = "0.2.6, 0.3"
 MLJModels = "0.2.0"
 julia = "1"
 
 [extras]
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb"
+MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 
 [targets]
-test = ["DecisionTree", "RDatasets", "Test", "UnicodePlots"]
+test = ["CSV", "DecisionTree", "MLJBase", "RDatasets", "Test", "UnicodePlots"]

README.md

@@ -7,9 +7,7 @@ A pure Julia machine learning framework.
 
 ## `join!(MLJ, YourModel)`
 
-**Call for help.** MLJ is [getting
-attention](https://github.com/trending/julia?since=monthly) but its
-small project team needs help to ensure its success. This depends
+**Call for help.** MLJ needs your help to ensure its success. This depends
 crucially on:
 
 - Existing and developing ML algorithms implementing the MLJ model interface