feature 1 in stupid feature
change 2 in stupid feature
fix a bug after fork on stupid feature
Merge branch 'stupid_feature'

* stupid_feature:
  change 2 in stupid feature
  feature 1 in stupid feature

Conflicts:
	git intro.txt