Closes 6#: Fixing merge issues

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
11 files changed
tree: 79ee5f5a0dc821a9ed1237e489a8c4904cb9b897
  1. source/
  2. .gitignore
  3. LICENSE
  4. Makefile
  5. README.rst