added a new shape for fun
Merge branch 'master' of github.com:pauljnixon/Graphics

Conflicts:
	homework/1/Assignment1-Shape/Assignment1