Signed-off-by: SHILLMEDIA <SHILLMEDIA@SHILLMEDIA-PC>
Merge branch 'master' of https://github.com/yokesh28/screative.git

Conflicts:
	page.php

Signed-off-by: SHILLMEDIA <SHILLMEDIA@SHILLMEDIA-PC>