adding bootstrap
adding bootstrap
no idea what this is
deleting
Merge commit 'c7d80f38f18c57d74c93600fb6fd31f88bbc00a7'

Conflicts:
	index.html