som, after facebook parse login working crudely
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html