initial commit
Updating files to be more generic to add to public git repo.
fixing readme merge conflict