for merge
Merge branch 'master' of https://github.com/Timoran/hocuspocus

Conflicts:
	.classpath
add ignored files