sam changes
Merge branch 'master' of https://github.com/codex8/IPD