clearing conflicts
merge in wun7 branch
merge zip from github - recursively fetches all current files
Merge branch 'master' of https://github.com/bakerjd99/Analyze-the-Data-not-the-Drivel
fix some typos - proof reading is never done
set .gitattributes to normalize line ends
do not convert line ends for xml
normalize line endings
jhs meets mathjax - v1
last JHS meets MathJax draft
JHS meets MathJax post xml
add .gitattributes to local master
normalize local master line endings
merge from remote master
update sha1 manifest
prepare to merge win7 branch
update from win7 branch - adjusted latex
Merge branch 'master' of https://github.com/bakerjd99/Analyze-the-Data-not-the-Drivel
merge in JHS meets MathJax from win7 branch
update latex sha1 checksums from win7 branch