Signed-off-by: janani <janu.vu@gmail.com>
Merge branch 'master' of https://github.com/yokesh28/screative.git

Conflicts:
	css/style.css

Signed-off-by: janani <janu.vu@gmail.com>