Merge pull request #1 from shubhank-srivastava/master

User Interface of the App
Removed user related conflicts

Signed-off-by: Abhishek Jairath <jairath.abhishek@gmail.com>
Repo related conflicts resolved

Signed-off-by: Abhishek Jairath <jairath.abhishek@gmail.com>
Merge pull request #2 from shubhank-srivastava/master

Upload files
Merge pull request #2 from abhishekjairath/master

update fork form head