change TODO to markdown format
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	TODO.md
change TODO to markdown format