rendering home view
merged changes