github oauth attempt. not working yet.
fixed conflicts