Fixing API to be fully encapsulated
Merge branch 'master' of https://github.com/christopherfan/IOLab_Project1
Merge branch 'master' of https://github.com/christopherfan/IOLab_Project1.git