Sync again
Merge branch 'master' of https://github.com/ggetz/Starbright

Conflicts:
	Starbright Game/Assets/Scripts/Generator.cs