Updated README
Merge branch 'master' of github.com:mcfitz2/timeline