Merge pull request #35 from belindahare/master

changes to welcome controlelr
fixed welcome controller merge error