Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 20 insertions, 1 deletions

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 30924370..a1492276 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -5,12 +5,15 @@ Original author and main developer: Frédéric Guillot (fguillot)
 
 Contributors:
 
+- [85pando](https://github.com/85pando)
 - Alex Butum
 - [Aleix Pol](https://github.com/aleixpol)
 - [Ally Raza](https://github.com/alirz23)
+- [Angystardust](https://github.com/angystardust)
 - [Anjar Febrianto](https://github.com/Lasut)
 - [Ashbike](https://github.com/ashbike)
 - [Ashish Kulkarni](https://github.com/ashkulz)
+- [Busfreak](https://github.com/Busfreak)
 - [Christian González](https://github.com/nerdoc)
 - [Chorgroup](https://github.com/chorgroup)
 - Claudio Lobo
@@ -20,11 +23,16 @@ Contributors:
 - [Crash5](https://github.com/crash5)
 - [Creador30](https://github.com/creador30)
 - [Cynthia Pereira](https://github.com/cynthiapereira)
-- [David-Norris](https://github.com/David-Norris)
+- [d4rk5eed](https://github.com/d4rk5eed)
+- [Damian](https://github.com/dromek)
 - [Daniel Raknes](https://github.com/danielraknes)
+- [David-Norris](https://github.com/David-Norris)
+- [Dmitry](https://github.com/dmkcv)
+- [Djpadz](https://github.com/djpadz)
 - [Draza (bdpsoft)](https://github.com/bdpsoft)
 - [Eskiso](https://github.com/eSkiSo)
 - [Esteban Monge](https://github.com/EstebanMonge)
+- [Eugene (JohnBat26)](https://github.com/JohnBat26)
 - [Fábio Hideki](https://github.com/fabiohxcx)
 - [Fabiano Castro Pereira](https://github.com/fabiano-pereira)
 - [Federico Lazcano](https://github.com/lazki)
@@ -37,12 +45,14 @@ Contributors:
 - [Jan Dittrich](https://github.com/jdittrich)
 - [Janne Mäntyharju](https://github.com/JanneMantyharju)
 - [Jean-François Magnier](https://github.com/lefakir)
+- [Jeff Guillou](https://github.com/jf-guillou)
 - [Jesusaplsoft](https://github.com/jesusaplsoft)
 - [Jesús Marín](https://github.com/alu0100502114)
 - [Jules Verhaeren](https://github.com/julesverhaeren)
 - [Karol J](https://github.com/dzudek)
 - [Kiswa](https://github.com/kiswa)
 - [Kralo](https://github.com/kralo)
+- [Kolesar](https://github.com/Kolesar)
 - [Lars Christian Schou](https://github.com/NegoZiatoR)
 - [Lesstat](https://github.com/Lesstat)
 - [Levlaz](https://github.com/levlaz)
@@ -54,16 +64,20 @@ Contributors:
 - [Maxime](https://github.com/EpocDotFr)
 - [Max Kamashev](https://github.com/ukko)
 - [mfoucrier](https://github.com/mfoucrier)
+- [Matthew Cillo](https://github.com/peripatetic-sojourner)
 - [Mgro](https://github.com/mgro)
 - [Michael Lüpkes](https://github.com/mluepkes)
 - [Mihailov Vasilievic Filho](https://github.com/mihailov-vf)
 - [Moraxy](https://github.com/moraxy)
+- [Muhaimin](https://github.com/infacq)
 - [Nala Ginrut](https://github.com/NalaGinrut)
 - [Nekohayo](https://github.com/nekohayo)
 - [Nicolas Lœuillet](https://github.com/nicosomb)
+- [Nick Blackledge](https://github.com/nttict-nick-b)
 - [Norcnorc](https://github.com/norcnorc)
 - [Nramel](https://github.com/nramel)
 - [Null-Kelvin](https://github.com/Null-Kelvin)
+- [Ogün Karakuş](https://github.com/ogunkarakus)
 - [Olaf Lessenich](https://github.com/xai)
 - [Oliver Bertuch](https://github.com/poikilotherm)
 - [Oliver Jakoubek](https://github.com/jakoubek)
@@ -72,6 +86,8 @@ Contributors:
 - Paolo Mainieri
 - [Pavel Roušar](https://github.com/rousarp)
 - [Peller Zoltan](https://github.com/PierP)
+- [Perburn](https://github.com/perburn)
+- [Peripatetic-sojourner](https://github.com/peripatetic-sojourner)
 - [Petja Touru](https://github.com/Petja)
 - [Pierre-Alexis de Solminihac](https://github.com/pa-de-solminihac)
 - [Piotr Zęgota](https://github.com/ZegalPL)
@@ -82,6 +98,7 @@ Contributors:
 - [Sebastien Pacilly](https://github.com/spacilly)
 - [Sebastian Reese](https://github.com/ReeseSebastian)
 - [Semyon Novikov](https://github.com/semka)
+- [StavrosKa](https://github.com/StavrosKa)
 - [Sylvain Veyrié](https://github.com/turb)
 - [Thomas Lutz](https://github.com/phoen1x)
 - [Timo](https://github.com/BlueTeck)
@@ -89,10 +106,12 @@ Contributors:
 - [Tomáš Votruba](https://github.com/TomasVotruba)
 - [Toomyem](https://github.com/Toomyem)
 - [Tony G. Bolaño](https://github.com/tonybolanyo)
+- [Trapulo](https://github.com/Trapulo)
 - [Torsten](https://github.com/misterfu)
 - [Troloo](https://github.com/troloo)
 - [Typz](https://github.com/Typz)
 - [Vedovator](https://github.com/vedovator)
+- [Vitaliy S. Orlov](https://github.com/orlov0562)
 - [Vladimir Babin](https://github.com/Chiliec)
 - [Yannick Ihmels](https://github.com/ihmels)
 - [Ybarc](https://github.com/ybarc)