Messaging Finished
DI IS DUM
Merge branch 'master' of https://github.com/aaronmatt1/CS4400

Conflicts:
	.idea/workspace.xml