from admin side
Merge branch 'master' of github.com:rajfaujdar/demo1

Conflicts:
	hello.txt