changes
Jumbotron Changes
complete merge
Merge pull request #6 from ShannonWest/mastermerge

Mastermerge