Merge remote-tracking branch 'origin/master'

data.json

src/main/java/com/cpsc329pm/DataStorage.java

src/main/java/com/cpsc329pm/Encryption.java

src/main/java/com/cpsc329pm/MasterLogin.java

src/main/java/com/cpsc329pm/StoredServicesController.java

src/main/resources/com/cpsc329pm/StoredServices.fxml