added jumping as activity
Merge branch 'arbitman-feature' of https://github.com/githubschool/example-basic into arbitman-feature

Conflicts:
	githubteacher.md

resolving conflict