Friday morning commit
Merge branch 'welcome_page'