Merge remote-tracking branch 'origin/master' into develop

Conflicts: requirements.txt
jason-neal · Nov 6, 2017 · fb9706f · fb9706f
2 parents 60648bf + a62c0f5
commit fb9706f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # spectrum_overload
+[![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/jason-neal)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3e9a2cf4ad914e0ebc24b6b2b83059db)](https://www.codacy.com/app/jason-neal/spectrum_overload?utm_source=github.com&utm_medium=referral&utm_content=jason-neal/spectrum_overload&utm_campaign=badger)[![Updates](https://pyup.io/repos/github/jason-neal/spectrum_overload/shield.svg)](https://pyup.io/repos/github/jason-neal/spectrum_overload/)[![Python 3](https://pyup.io/repos/github/jason-neal/spectrum_overload/python-3-shield.svg)](https://pyup.io/repos/github/jason-neal/spectrum_overload/)
 
 | Branch  | Docs | Build | Coverage | Code Climate | 

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ matplotlib==2.1.0
 astropy==2.0.2
 scipy==0.19.1
 pyastronomy==0.11.0
-hypothesis==3.31.0
+hypothesis==3.31.2
 pytest==3.2.2
 pytest-cov==2.5.1
 python-coveralls==2.9.1