Updated CHANGELOG with latest pull request
@@ -7,6 +7,7 @@ Changes since last release
* Allow `eps_rel=0` [#40](https://github.com/oxfordcontrol/osqp/issues/40)
* Fixed bug when calling `osqp_solve` or `osqp_cleanup` after failed linear system initialization
* Add "install" CMake target and installation of CMake configuration files
+* Fixed potential name conflict with SCS [47](https://github.com/oxfordcontrol/osqp/issues/47)
Version 0.2.1 (25 November 2017)
