Merge origin/master

Conflicts:
	src/citbyui/cit260/connect4/models/PlayerName.java