Refined the graphics to almost completely functional
Refined the graphics to almost completely functional
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/frameTest.java