ing
Merge branch 'master' of https://github.com/almostsank/ossf
killl the diff
Conflicts:
	hello.cpp