Try merge
Merge branch 'master' of https://github.com/ByzanTine/EECS285-TowerDefense.git
DataBase finished and Units toString method changed,
the name standard is written in the Code javaDoc