added code to c and added d, e, and f
added x, y, and z
Merge branch 'auth'