Added Sarthak Jaiswal's code

Added his Organization, User classes. Also fixed a merge issue.