Hello world
Merge branch 'master' of https://github.com/hasithvm/shiny-octo-bear

Conflicts:
	main.c