Finishes A5
Merge branch 'master' of https://github.com/jacksonchen/Picture-Lab

Conflicts:
	classes/PictureTester.java
	classes/package.bluej

Finishes A5