reset
resetting stuff.

Merge https://github.com/fboehm/fall2013

Conflicts:
	math733/hw2/733hw2.pdf
	stat840/hw/hw6/840hw6.Rmd
	stat840/hw/hw6/840hw6.html
	stat840/hw/hw6/840hw6.md