updating format1
Merge branch 'master' of https://github.com/atabas/WebDev

Conflicts:
	format1.html