Merge pull request #1 from bwood/openberkeley-105

Openberkeley 105
Merge pull request #3 from bwood/openberkeley-105

Openberkeley 105
Merge branch 'develop' because I need the most recent README to show up in the master branch