Updated from master, solved conflicts
authorJavier Fernandez-Ivern <javier.ivern@gmail.com>
Tue, 27 Oct 2015 04:14:04 +0000 (23:14 -0500)
committerJavier Fernandez-Ivern <javier.ivern@gmail.com>
Tue, 27 Oct 2015 04:14:04 +0000 (23:14 -0500)
commit105c46f1816f6854574e1de98702301fb8dca07e
treed9d7c3127b2beda6273ed706d0386b90775465e4
parentd937c5a1e8b231acd9292a43fe3432e86be16c46
parent6749588df5cafadb98db30dda3706535175d5ed2
Updated from master, solved conflicts
Makefile
README.md