Trying combined readme.
Merge branch 'master' of https://github.com/justinwalsh/todaycms