Add hello

Add Goodbye

Amend Hello
Merge branch 'master' of https://github.com/zloncar/test

Conflicts:
	Hello