Liam Beckett 25fcc8cf94 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 ...

# Conflicts:
#	res/userdb.db

2016-09-16 16:38:31 +12:00

..

main

Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

2016-09-16 16:38:31 +12:00

test/java/seng202/group9

Changed some tests to reflect some function name changes

2016-09-16 00:19:57 +12:00