Removed calculator.m from project settings in class
Committing Branch 1 and 2 and part of 3
committing branch 3, but i still have some errors that will hopefully fix themselves
committing batch 5
committing branch 6
committing branch 7