Manual spell-checked (dunno why I didn't before)
Merge branch 'master' of https://github.com/MiguelDickson/cs1555