supposed brian-rewrites
Merge branch 'master' of https://github.com/jonathanws/Classmate

Conflicts:
	src/edu/towson/cosc/classmate/scheduler/DeleteMessage.java
	src/edu/towson/cosc/classmate/scheduler/DisplayAllMessages.java
	src/edu/towson/cosc/classmate/scheduler/DisplayMessage.java
	src/edu/towson/cosc/classmate/scheduler/NetworkCall.java
	src/edu/towson/cosc/classmate/scheduler/ReceiveMessage.java
	src/edu/towson/cosc/classmate/scheduler/SendMessage.java
	src/edu/towson/cosc/classmate/scheduler/SystemCall.java
	src/edu/towson/cosc/classmate/scheduler/UserCall.java