Merge branch 'Aaron' of https://github.com/BU-ECE-504-S14/EC504-raytracer into Aaron

Conflicts:
	RT/src/GUI/ScenePanel.java