first run
Merge remote-tracking branch 'origin/master'
first run
Merge remote-tracking branch 'origin/master'

Conflicts:
	rubric/index.html
change with the php in processSignIn