readme
feature 1 done
feature 1 directly in master
Merge branch 'feature1'

* feature1:
  feature 1 done

Conflicts:
	feature1.txt
feature2
feature2
Merge remote-tracking branch 'github/master'

* github/master:
  Initial commit