merged README

This commit is contained in:
David Baldwynn 2015-11-23 12:20:45 -08:00
commit 14c9b00d67