Merge remote-tracking branch 'upstream/master'
The fast forward merge failed.
Merge remote-tracking branch 'origin/master'
Added ATLAS and LAPACK mentions for libcblas.so and cblas.h files
Merge pull request #202 from johnholt/ML_240

Added ATLAS and LAPACK mentions for libcblas.so and cblas.h files
Merge remote-tracking branch 'upstream/master'