second_commit
third_commit
third_commit
Merge branch 'master' of https://github.com/web115/web13111115

Conflicts:
	hello/hello.txt
first_commit