ryan's revisions
Merge branch 'master' of github.com:ryanaustincarlson/ML-FinalProject2012-EdModeling

Conflicts:
	edm_latex/edmVersion.tex