prealpha test
Merge remote-tracking branch 'orig/master'

Conflicts:
	.gitignore