sync commit
Merge branch 'master' of https://github.com/jordanhenderson/GalacticSupremacy2

Conflicts:
	Assets/LoginScene.unity
	Assets/scene1.unity