comment out extra factory girl user in spec
fixed merge conflict
fix questions create
updated users show action to create user profile
tested question create action
merge conflict
Merge pull request #3 from elreimundo/user_profile

User profile