Commit Test Sublime Git Integration
Tabs added
Trial double column and scrollbar
Merge branch 'Angela'

Conflicts:
	bootstrap.css
	index.html