first commit after a long while
Merge branch 'master' of http://github.com/jensenr30/De_Flux
yay
wow, wtf is wrong with git
wow, wtf is wrong with git
trying to fix da problemz...
fixed da problem
Merge branch 'inventory'

Conflicts:
	.gitignore
	bin/Debug/De_Flux.exe
	gameplay_functions.h
	globals_and_headers.h
	main.c
	obj/Debug/main.o
	tile_and_item_definitions.h
cleaned up some parts in mapmaker and added a box opening sound.
applied low-pass filter to _button_click.wav
house cleaning
made a spiral map.
^ inventory system and ^ inventory gui

i'm making serious progress with both.
:3