Too much to say in a message
Add alert
Merge branch 'master' of github.com:ha-D/Gazzle

Conflicts:
	public/index.html
	public/static/js/script.js