update
Merge branch 'inventory' of https://github.com/jensenr30/De_Flux into inventory

Conflicts:
	.gitignore