https
Merge branch 'master' of github.com:giacomogiudice/EPFLCloudPrint

Conflicts:
	index.html