added git ignore
test all user related class
solve conflicts