Merge pull request #31 from belindahare/master

removed redundant code from welcome controller