Basic Styling/Bootstrap
Bootstrap
Resolved welcome index merge error
Merge
Updated Files
Merge pull request #12 from csrobinson86/master

Updated Files