bbcommit1
h
h0:46-10.04.2013
nj
q
Merge branch 'master' of https://github.com/drunia/imgcopyrighter.git

Conflicts:
	ImageCopyrater/bin/main/ImageCopyrighter.class
	ImageCopyrater/src/main/ImageFileChoser.java