Should be done with formatting the API
I'll check over it again soon
Merge branch 'master' of https://github.com/ndrewniklas/ProgAssgmnt1.git