more work on introDialogue, and introDocuments
finishes work on alert and document handler
Merge branch 'master' of github.com:ojourmel/csci331-team-red into server

Conflicts:
	src/main/java/csci331/team/red/network/NetServer.java
Merge branch 'master' of github.com:ojourmel/csci331-team-red into server

Conflicts:
	src/main/java/csci331/team/red/client/ClientEngine.java
	src/main/java/csci331/team/red/network/NetClient.java
	src/main/java/csci331/team/red/network/NetServer.java
	src/main/java/csci331/team/red/server/AlertHandler.java
	src/main/java/csci331/team/red/shared/Dialogue.java
fixes the problems with clientEngine sending the wrong message
Merge pull request #26 from ojourmel/server

Server