no message
no message
Merge branch 'master' of https://github.com/gooner22/ImageTool

Conflicts:
	META-INF/MANIFEST.MF
	src/main/java/com/kma/ImageTool/Model/WorkingWithImage.java
template name feature