Updates to formatting/organization and included Amir's work for
Implementation of Standard
Merge branch 'master' of https://github.com/Polo08816/COSC650.git
Fixing commit