Changes

Created page with '* Went over last touchups. * Fixed formatting across all classes to standards * Ran tests and fixed debugging issues. * Finalized and merged to master!'