- added rule collapsing
Merge branch 'master' of github.com:ipv6Watch/fortress

Conflicts:
	html/index.html