Add login for google and github
Merge remote-tracking branch 'origin/master'

Conflicts:
	sign-in.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/backand_ui.js
	sign-in.html