Post-merge fixes.
Merge branch 'master' of https://github.com/DannyBobby/INFO450-ATM-Revisited.git