??
Merge branch 'master' of https://github.com/afw3318/reu2013

Conflicts:
	Presentations/week2/slides.log
	Presentations/week2/slides.pdf