Added functions for gross interest rate and real wage.
Added functions for mpk, mpl, and tau.
Added functions for computing income.
Added function for computing aggregate capital.
Daily merge.

working'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.