Initial commit
changed readme file
resolve conflict