js
Merge branch 'master' of https://github.com/Magrit/Cozy-Ai-Project-AIAIAI

Conflicts:
	index.html