Pulled latest master into style branch
Changed styles
Fixed merge issue on index
Merged edited stylesheet