Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster into piethrowing
# Conflicts: # RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
This diff is collapsed.
# Conflicts: # RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml