all current extension work
garbage file
ignore dat
Merge branch 'master' into extension

Conflicts:
	.gitignore