Blerg
Merge branch 'master' of github.com:austintrose/hackathon-project

Conflicts:
	scripts/reader.js
Documented definition for a particular degree, and fixed what that broke.