Commit?
Merge branch 'master' of https://github.com/BoundlessWisdom/WorldGame

Conflicts:
	Enviromentalism/.classpath
	Enviromentalism/bin/.gitignore