welcome page
merge conflicts
Merge pull request #1 from twuster/welcome_page

Welcome page