pre merge commit
Merge branch 'master' of https://github.com/Laracuet/Systems-A-D-Project-Code
database switch and revert backwards to solve errors
Merge branch 'master' of https://github.com/bmwirth09/Systems-A-D-Project-Code
finally resolved