Fixed Zoom, Fixed issue of images not loading
Merge branch 'sixth_iteration' of https://github.com/Achillia/version1.git into sixth_iteration