Merge branch 'master' of git://github.com/pTricKg/web_dev

	deleted:    home.html
Merge branch 'master' of git://github.com/pTricKg/web_dev