change konamis, corrected text
Merge remote-tracking branch 'origin/dev1' into dev1

Conflicts:
	flat-theme-free-responsive-multipurpose-site-template/index.html