altered
Merge branch 'alt'

Conflicts:
	assterio.txt