:) Conflicts: CONTRIBUTORS.txt
@@ -163,4 +163,5 @@ Brian Bouterse, 2014/04/10
Dmitry Malinovsky, 2014/04/28
Luke Pomfrey, 2014/05/06
Alexey Kotlyarov, 2014/05/16
+Ross Deane, 2014/07/11
Tadej Janež, 2014/08/08
Ross