asdf

asef
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
	inc/_notes/dwsync.xml
Merge branch 'master' of https://github.com/torgrimsonja/mathStats

Conflicts:
	_notes/dwsync.xml
Merge branch 'master' of https://github.com/torgrimsonja/mathStats