Midway commit to get the changes from Fornmative.
Merge branch 'master' of https://github.com/Essnit/Project
Resolving Merge Conflict. Basic functionality of SaScore implemented. Bitch is up and running.