message
Merge branch 'master' of https://github.com/peterdanielmyers/Aleph2Omega

Conflicts:
	LICENSE
	README.md