[Pranav, Chethan] adding user to the app
[Pranav, Chethan] removing compiled files from git
[Pranav, Chethan] Removed .idea files from git
Resolving merge conflicts