added username, not gtid#
Merge branch 'Jackie'
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders