initial commit
Merge branch 'master' of github.com:jsogarro/college_calculator

Merging because I initialized the file on GitHub.com. Had to pull it before I could commit.