Bugs fixed in Remco's code and our code
Merge branch 'master' of github.com:pauljnixon/Graphics

Conflicts:
	inclass/1/ply