"hello"
Merge branch 'master' of https://github.com/gwilczynski/git-scm-in-one-hour

Conflicts:
	cupcake.txt
Merge branch 'master' of https://github.com/gwilczynski/git-scm-in-one-hour