let's try it
Merge branch 'master' of https://github.com/InversePandas/Fire

Conflicts:
	.DS_Store
working with db and text