Edit merge_file

Entered very important content to "merge_file".
Merge branch 'master' of https://github.com/morteano/test

Conflicts:
	merge_file