ToDo file added in doc folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/ToDo
ToDo file added in doc folder