Update 1
Merge branch 'master' of https://github.com/ahofmann4/stat540-2014-Hofmann-Analise

Conflicts:
	README.html
	README.md
	README.txt
	figure/unnamed-chunk-3.png
	figure/unnamed-chunk-5.png