ChallengeFriend servlet is in process
Merge branch 'master' of https://github.com/uesports135/CSI418-TeamTwoTicTacToe

Conflicts:
	src/models/Game.java
Merge branch 'master' of https://github.com/uesports135/CSI418-TeamTwoTicTacToe

Conflicts:
	WebContent/WEB-INF/web.xml
	build/classes/models/Game.class
	build/classes/models/Player.class
Challenging a friend is now possible
Merge branch 'master' of https://github.com/uesports135/CSI418-TeamTwoTicTacToe

Conflicts:
	.gitignore
	WebContent/WEB-INF/web.xml
	WebContent/views/header.jsp
	WebContent/views/home.jsp
	build/classes/controllers/GameServlet.class
	build/classes/controllers/LoginServlet.class
	build/classes/controllers/StartGame.class
	build/classes/models/Database.class
	build/classes/models/Game.class
	build/classes/models/GameBoard.class
	build/classes/models/Player.class
	src/controllers/GameServlet.java
	src/controllers/LoginServlet.java
	src/controllers/StartGame.java
	src/models/Database.java
	src/models/Game.java
	src/models/GameBoard.java
	src/models/Player.java