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

Conflicts:
	githubteacher.md

resolving conflict
fixed conflict
resolved conflicts
Merge pull request #34 from githubschool/arbitman-feature

Arbitman feature