renamed file
add discrete example
fixed merge conflicts

Merge branch 'master' of github.com:jarad/stat544

Conflicts:
	slides/Ch11/metropolis-hastings.Rnw