gitignore added
recommiting
revmoved
mrconfig removed conflicts after the first clone