At last, rename to avoid confusion
Merge branch 'master' of github.com:mikeroll/OSSP2