Add diffconflicts tool
Merge branch 'master' of https://github.com/superekcah/utils

Conflicts:
	parse_iptables.py