init

Conflicts:
	.gitignore
find bug