Adding some readme stuff
Merge branch 'master' of https://github.com/dhuth/test-chill