Basic Styling/Bootstrap
Bootstrap
Resolved welcome index merge error
Merge