login added
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/landing.html
landing merged