GAH STASH
fix merge conflict
change some styling on header, style splash page.
fix merge conflict
Merge pull request #22 from ricarora/style-header

Style header
fixed merge conflict