first commit
Merge https://github.com/wirelesspt/ircd

Conflicts:
	README.md
	.git/MERGE_HEAD

	deleted:    README.md
Merge https://github.com/wirelesspt/ircd

Conflicts:
	LICENCE
	.git/MERGE_HEAD

	deleted:    LICENCE
	new file:   LICENSE
	new file:   README.md