mod 2, #2
Merge github.com:christian-fei/grasp-git

Conflicts:
	2
added 1, plus content 1\m2
I want to keep my work