tested stuff
Merge branch 'frontend' of github.com:stuycs-softdev/proj2-pd7-03-ArmyOfDarkness into frontend