Assets and changes to home template

Added CSS and image assets; styling changes to home template
Fixed merge conflicts