Merge pull request #18 from osuosl/develop

Bring master back to where it was.