Merge branch 'master' of https://github.com/Hi4s/Documents.git

Conflicts:
	workspace/ImageViewer/src/imageviewer/Main.java
	workspace/ImageViewer/src/imageviewer/view/PlainRandomImageViewerGUI.java
Removing a debugging sysout from ImageViewer
Merge branch 'master' of https://github.com/Hi4s/Documents.git
Fixed windowd mode for the ImageViewer