welcome page styled
fixed merge conflict in article_show
Merge pull request #45 from alangster/welcome-page

welcome page styled