added info to inventory. inventory upgrade. changed working directory as well.

Signed-off-by: jensenr30 <jensenr30@gmail.com>
Merge branch 'master' of https://github.com/jensenr30/De_Flux

Conflicts:
	functions.h