Merge pull request #1 from jambola2/master

...
Password Hashing function added
Merge pull request #3 from nikhil6412/master

Merge pull request #1 from jambola2/master
Update User.java
Update User.java
Merge pull request #6 from jambola2/master

Test: Merge with conflicts