my intro
Made it a function for basic calc
advcalc
merge conflict resolved
lets fix the while loop together
the finale
Attempted to fix while loop
Fixed merge development
Final touches to the development before end of class