Created .gitignore
Created index.html
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.gitignore