Merge branch 'WHQBranch'
TEST
Revert 47e0325..e75f6eb

This rolls back to commit 47e0325d6b7595be901800068ee6d96ec1933d29.
'Circle Panel' + 'Cirle' + 'Rectangle'
Revert "'Circle Panel' + 'Cirle' + 'Rectangle'"

This reverts commit 8444d4d7bda625207f7d4d4b25cc3f93edb3b482.
Merge branch 'WHQBranch'
Update Clue.java
mess with class files
update
Update CluePanel, Add ClueButton

Conflicts:
	bin/ControllerFrame.class
	bin/WHQImageBaseButton.class
Merge branch 'WHQMerge' into Fangjie-Hou

Conflicts:
	bin/AssistantPanel.class
	bin/ControllerFrame$1$1.class
	bin/ControllerFrame$1.class
	bin/ControllerFrame.class
	bin/Main.class
	bin/QAPanel.class
	bin/TextButton.class
	bin/WHQPanel.class
	src/QAPanel.java
dec13 7:30
Merge branch 'Fangjie-Hou' into mergeBranch

Conflicts:
	bin/Main.class
	bin/WHQPanel.class
for hou
Merge branch 'Jiahao-Chen' into mergeBranch

Conflicts:
	.classpath
	bin/ControllerFrame$1$1.class
	bin/ControllerFrame$1.class
	bin/ControllerFrame.class
	bin/Main.class
	bin/MovingCirclePanel$1.class
	bin/MovingCirclePanel.class
	bin/WHQPanel.class
	src/Main.java
Merge branch 'mergeBranch' into WHQBranch

Conflicts:
	bin/Main.class
	src/Main.java