added contents
Merged branch 'master' of https://github.com/darkdefender8/try_git

Conflicts:
	file1.txt
changes
Merge branch 'master' of https://github.com/darkdefender8/try_git

Conflicts:
	file1.txt