Merge origin/master

Conflicts:
	README.md
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	README.md
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/kayla_branch
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