added conditional
Merge branch 'development' of github.com:dan-westall/planetary-annihilation-tournament-manager into development