Added missing semi-colon.
Fixed star shape and added diamond shape.
Merge branch 'shapes'