borning master
added version 2
changes mind
Merge branch 'version2'

* version2:
  added version 2

Conflicts:
	pasta.md
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update pasta.md

Conflicts:
	pasta.md