fixed welcome controller merge error
corrected merge errors in the layout
Merge pull request #36 from belindahare/master

corrected merge errors in the layout