update
Merge https://github.com/CabbageNom/GenStroids

Commit test
Add UID generator
implementation of UID
Merge branch 'master' of https://github.com/CabbageNom/GenStroids

Conflicts:
	src/game/Entities.java
	src/game/Entity.java
Merge branch 'master' of https://github.com/CabbageNom/GenStroids