none
Merge branch 'master' of https://github.com/mar3/imgodr

Conflicts:
	imgodr.v12.suo