fixed error upon admin sign in
fixed conflict and added files to ignore in git