reformated it to print out better
Merge branch 'master' of https://github.com/ccard/csci260FinalPro
deleted calc file