deadline revision
small edits to readme
more possibilities for integration
Merge branch 'master' into sarah