requeue
Merge remote-tracking branch 'origin/master'

Conflicts:

	coms319.group10.project4/src/coms319/group10/project4/whiteboard/Player.java
Merge branch 'master' of https://github.com/aguibert/coms319-project4

Conflicts:
	coms319.group10.project4/WebContent/index.jsp