Game GUI and basic login
Merge remote-tracking branch 'upstream/master'
Finished merging changes