commiting so I can pull down styles
changes to welcome controller
put ben's whitelisting back in welcome controller
Merge pull request #31 from belindahare/master

removed redundant code from welcome controller