Initial commit
Update README.md
src files
Merge branch 'master' of github.com:tophertimzen/-dining-philosophers-
updates
Merge branch 'master' of github.com:tophertimzen/cs115

Conflicts:
	puppet/README