Added example to README and updated makefile.
updated license and docs
resolve conflicts
Merge pull request #5 from hybridgroup/docs

updated license and docs