First commit
Merge branch 'master' of github.com:fr4nkio/ncmon

Conflicts:
	LICENSE
First commit
Merge branch 'master' of github.com:fr4nkio/ncmon

Conflicts:
	LICENSE

Conflicts:
	LICENSE