added refactoring-tutorial
resolved conflict