Merge remote-tracking branch 'origin/master'

这个提交包含在:
Craig Warren
2016-03-18 14:01:48 +00:00
当前提交 18318a7c3c

查看文件

@@ -9,9 +9,9 @@ dependencies:
- matplotlib - matplotlib
- mpi4py - mpi4py
- numpy - numpy
- psutil
- scipy - scipy
- pip: - pip:
- pyfiglet - pyfiglet
- psutil