Frist Commmit
Merge branch 'master' of github.com:minkiele/canton

Conflicts:
	.gitignore
Made something (better than nothing)