Merging changes from stage
Refactoring HTML/CSS code and resizing pages
Refactoring HTML/CSS code and resizing pages again
Merging changes with the group repo
Merge conflicts