21/10

Signed-off-by: unknown <amardeep2551@amardeep2551.Nagarro.local>
Merge branch 'master' of https://github.com/amardeepkhera/giftcardx.git

Conflicts:
	src/main/java/com/giftcardx/service/UserService.java
21/10 from office