Integrated the Renderer
Merge branch 'master' of
https://github.com/ChaoHou/Swen222-Group-Project

Conflicts:
	Group-project/src/UI/GameFrame.java