added welcome controller tests, passed
Merge pull request #34 from amelialaundy/welcome_controller_tests

added welcome controller tests, passed
pulling changes from master