more notes
Merge branch 'master' of github.com:veltzer/linuxapi

Conflicts:
	doc/TODO_now.txt
merged the TODO