added bootstrap formatting
merged into master