Stuff we worked on in class with the registration
Merge remote-tracking branch 'origin/master'