xaxa
xaxa
Merge remote-tracking branch 'origin/windoze' into macosx

Conflicts:
	.gitignore
mostly done for mac
xaxa
xaxa
xaxa