Base code as at 04/02
Merge branch 'master' of https://github.com/croxio5/SwissMangaKnife

Conflicts:
	.gitignore