Hai
Merge branch 'master' of https://github.com/rileykarson/stand-up

Conflicts:
	hello.py