Merge branch 'master' into develop

cyclus · Nov 1, 2016 · eeba76a · eeba76a
2 parents c7f082e + 214594a
commit eeba76a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -9,11 +9,13 @@ This project has had contributions from the following people (in alphabetical or
 * Robert Flanagan
 * Matthew Gidden
 * Katy Huff
+* Jenny Littell
 * Meghan McGarry
 * Baptiste Mouginot
 * Arrielle Opotowsky
 * Olzhas Rahkimov
 * Anthony Scopatz
+* Steve Skutnik
 * Paul P.H. Wilson
 * Zach Welch
 * John Xia