Initial commit
updated readme
fixed merge for readme
Merge pull request #1 from onethousandfaces/update-readme

updated readme