penambahan content yang sudah ada
Merge branch 'master' of https://github.com/jagadijo/testcms

Conflicts:
	test2