initial commit
fixing conflicts in readme