changes tovsetPassword cntd
more changes
Merge branch 'master' of https://github.com/da1rren/Group-A