Implemented factory_girl for user testing
Updated welcome views
Merge pull request #2 from thadley/user-testing

User testing