homepage styling
homepage styling, rails form additions/ammendments
fixed merge conflicts