removed todo, updated README (converted to markdown)
Merge commit '45f44'