Merge pull request #1 from LegioXV/testing

Commit
Merge branch 'master' of https://github.com/LegioXV/Grey-Goo-2
Merge branch 'testing'
miscchanges