resolve conflic between remote_git_test_init & local def.txt
Merge branch 'master' of github.com:sasowang/git_test_init

Conflicts:
	def.txt