new things
Merge branch 'master' of https://github.com/iviteri/test2

Conflicts:
	gittest2.txt