Staged properly
Merge github.com:pgrunde/basic-git

Conflicts:
	hello.txt
log update