dev 2 is made changes
Merge branch '1point-Ver-1.0.4.7' of https://github.com/shekar2395/HappyFiles into 1point-Ver-1.0.4.7

Conflicts:
	pspl/New Text Document.txt

dev 2 made changes and resolved the conflicts and commited