Added income plot
Merge branch 'master' of https://github.com/tcstewar/farm_game

Conflicts:
	farm_model/activity.py