Delete this filegit add .hello-world.swp
Merge branch 'master' of https://github.com/bcklosiu/hello-world

Conflicts:
	.hello-world.swp

delete this one!!