i didn't do anything

yup
Merge branch 'gcaven'
Added java project test
Added test class
Changes
Update README.txt
Removed test class
Test class added
Added message for Matt
added message for Lockhart in test.java

hi whats up
Just saying my junk works now
Edited the UML to be accurate

Arrow was facing the wrong way
Merge branch 'master' into Matts_Work