Create boom.html
Added .gitignore
Merge branch 'master' into Phase-2

Conflicts:
	.gitignore