warning
Some extra changes
Merge branch 'warning'

Conflicts:
	public/index.html