adding
Merge branch 'master' of https://github.com/chkwon/testgithubrepository

Conflicts:
	new LaTeX file.tex