Added methods for userLog files, updated user class and use database class to include passwords
Merged