Initial commit
Merge branch 'master' of https://github.com/leonarven/Channon

Conflicts:
	.gitignore