Erika Savell 4b485fe5ca Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules

2017-05-01 18:47:48 +12:00

..

java/seng302

Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules

2017-05-01 18:47:48 +12:00

resources

refactored the boat message to not use boats

2017-05-01 17:35:30 +12:00