looks like a bunch of Line Endings changes
Merge branch 'master' of github.com:ivanhanigan/ProjectTemplateDemo

Conflicts:
	ProjectTemplateDemo.org
	analysis/data/Chicago.csv
	analysis/reports/learnR-tidy-data.html
	analysis/reports/learnR-tidy-data.org
	analysis/reports/learnR.log
	analysis/reports/learnR.toc
	analysis/src/NMMAPSlite-intro2regression.r