Stuff.
Merge branch 'master' of https://github.com/SmilyOrg/CodenameSnowman

Conflicts:
	src/Environment.ls