Goal and AmazonGoal class updated
We can add an actual Amazon Goal now!
Merged branch kevin