init commit
Merge branch 'master' of https://github.com/patriot7/knots

Conflicts:
	.gitignore