Initial Commit
init
mergeMerge branch 'master' of github.com:CircuitLab/konashi-sample

Conflicts:
	.gitignore