get_Image()
Merge remote-tracking branch 'origin/master' into WEN

Conflicts:
	.idea/workspace.xml
	PHP_test/css/display_image.css
	PHP_test/hello.php
	PHP_test/image_display.html
	PHP_test/js/image_display.js
	PHP_test/js/image_upload.js
~
`
~