Merge pull request #2 from dvanhorn/master

Moar students