edits to our work and partnership
Merge branch 'master' of https://github.com/rsoden/epic