add "Git Dojo!" to line 5
Merge branch 'master' into feature_hiyoko40

Conflicts:
	Numbers