Revert "merge test.java e final controller"

This reverts commit 5e0acfcb03ccda9d930fe44e617174b28b953335.
Revert "Revert "merge test.java e final controller""

This reverts commit 8e8c1f3e12bf8dff7bade3f4cecc5489cf023a51.
Merge branch 'master' of https://github.com/gagallo7/COMP9321