Haha

Time pass
Merge remote-tracking branch 'origin/changes' into changes

Conflicts:
	dari_date.html