Pushing some changes. Added BaseGoal, BaseOption, GoaReward.
Merge remote-tracking branch 'origin/master'