Added Bootstrap (and currently using navbar)
merged change conflicts