Create TODO.md
Update README.md
Update blog_entry.model
Fixed merge conflict