g

f
Merge remote-tracking branch 'origin/master'

Conflicts:
	Calc/index.md