Set up commit
css changes to style.css file to make zoom consistent
Merge conflict fixed