dev 1 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 1 has resolved conflicts