first commit
redoing first commit
resolve conflict in README