desktop modifications
fixed conflicts

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

Conflicts:
	slides/midterm_review/midterm_review.Rnw
some changes
template?