Merge origin/master

Conflicts:
	src/citbyui/cit260/connect4/models/PlayerName.java
Merge origin/master

Conflicts:
	src/citbyui/cit260/connect4/models/PlayerName.java
Merge origin/master

Conflicts:
	src/byui/cit260/connect4/frames/HelpMenu.form
	src/byui/cit260/connect4/frames/HelpMenu.java
	src/byui/cit260/connect4/frames/MainFrame.form
	src/byui/cit260/connect4/frames/MainFrame.java
Merge origin/master

Conflicts:
	src/byui/cit260/connect4/frames/HelpMenu.form
	src/byui/cit260/connect4/frames/HelpMenu.java
	src/byui/cit260/connect4/frames/MainFrame.form
	src/byui/cit260/connect4/frames/MainFrame.java