Fixed a thing with the editEquip modal, added more alert boxes
Merge branch 'master' of https://github.com/mkSol/CTEC227-Project