5

5
Merge branch 'master' of https://github.com/minghaow/Hello-world

Conflicts:
	Hello world!/main.cpp
6

6