update
Merge branch 'master' of github.com:irma7/Tutorial_IG

Conflicts:
	client/settings.html