Merge pull request #1 from shrimpboyho/master

Pulling in changes from shrimpboyho
Started the calculator
Merge
Committing sucks
Deleting ipch