Revert 2901650..2b3485d

This rolls back to commit 2901650125f38b051382ad3dd23c80447e7fa4cd.
Calc 1

Here is the first draft of the calc yall
bear?

Uhh
Merge branch 'master' of https://github.com/andyhullinger/WEB301-class-project-for-Fall14