commit ke 2
Merge branch 'master' of https://github.com/zeptian/ECbaru

Conflicts:
	img/bloktv.jpg