Added Goal class
Fixed merge conflict