push-pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html