changes made
fixed merge conflicts
code clean-up, readMe added
Merge pull request #13 from albreyb/master

Updated Read Me