commit before pulling patricks changes
Merge branch 'AlanJackMVP' of https://github.com/logantspeedy/Capstone into AlanJackMVP

Conflicts:
	Capstone/src/java/ServerClasses/Board.java
	Capstone/src/java/ServerClasses/Game.java