changed layout welcome
fixed merge issues
Merge pull request #18 from mwdion/master

changed layout welcome