Still beating
added some tolkien
Merge branch 'master' of https://github.com/pnblackwell/jumpstart
Merge branch 'master' of https://github.com/githubteacher/jumpstart

Conflicts:
	tolkien.txt