U[dated and added p tag
Merge branch 'dev_test'

Conflicts:
	test_html.html