web page layout
major changes in web page
Web page layout
changing image file extension
major changes to desktop page
Merging issue-5 into develop and resolving conflicts