BufferedImages are now stored within Image.
Merge branch 'master' of https://github.com/jenspfau/phd

Conflicts:
	src/test/TestClass.java