started on homepage styling
merge conflict in application.html.erb