s
Merge branch 'master' of https://github.com/itsdebbiee/IA

Conflicts:
	index.html
Merge branch 'master' of https://github.com/itsdebbiee/IA