Update the history

Conflicts:
	doc/whats_new.rst

Author: Guillaume Lemaitre

doc/whats_new.rst

@@ -20,6 +20,37 @@ Bug fixes
 - Fixed a bug in :class:`under_sampling.NearMiss` which was not picking the right samples during under sampling for the method 3. By `Guillaume Lemaitre`_.
 - Fixed a bug in :class:`ensemble.EasyEnsemble`, correction of the `random_state` generation. By `Guillaume Lemaitre`_ and `Christos Aridas`_.
 - Fixed a bug in :class:`ensemble.BalanceCascade`, solve the issue to obtain a single array if desired. By `Guillaume Lemaitre`_.
+- Fixed a bug in :class:`under_sampling.RepeatedEditedNearestNeighbours`, add additional stopping criterion to avoid that the minority class become a majority class or that a class disappear. By `Guillaume Lemaitre`_.
+
+New features
+~~~~~~~~~~~~
+
+- Added AllKNN under sampling technique. By `Dayvid Oliveira`_.
+
+API changes summary
+~~~~~~~~~~~~~~~~~~~
+
+- Two base classes :class:`BaseBinaryclassSampler` and :class:`BaseMulticlassSampler` have been created to handle the target type and raise warning in case of abnormality. By `Guillaume Lemaitre`_ and `Christos Aridas`_.
+
+Enhancement
+~~~~~~~~~~~
+
+- Added support for bumpversion. By `Guillaume Lemaitre`_.
+- Validate the type of target in binary samplers. A warning is raised for the moment. By `Guillaume Lemaitre`_ and `Christos Aridas`_.
+
+Documentation changes
+~~~~~~~~~~~~~~~~~~~~~
+
+- Added doctest in the documentation. By `Guillaume Lemaitre`_.
+
+.. _changes_0_1:
+
+Version 0.1
+===========
+
+Changelog
+---------
+>>>>>>> 4ebe7df... Update the history
 
 API
 ~~~