changed structure of passing values between functions
Merge branch 'master' of https://github.com/jinn35/QuadProject

Conflicts:
	SRC/input.c~
	SRC/input.h~