Fixed bug where a null unit was added to units
Merge branch 'master' of https://github.com/CMPUT350Balboa/Balboa.git