scan2
Merge branch 'master' of https://github.com/hansenundtoth/securilogdev

Conflicts:
	img/scan4.gif