Merge branch 'unix-compat'
Merge commit '0f13956'

* also eliminated ./todo.txt
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	todo.txt
Forgot the copyright in the README files
Merge branch 'master' into develop

Also saved todo.txt