change type from windows to unix
Merge branch 'master' of github.com:simon-rock/erlang

Conflicts:
	doc/my_erlang.txt

merge my_erlang