update .gitignore
Merge branch 'master' of https://github.com/CocaMelon/CocaMelon.github.io

Conflicts:
	.gitignore