Started homepage question
Merge branch 'users'