Makefile modified to be more awesome and intelligent
- Just that, better makefile
Makefile fixed, added a test
Merge branch 'makefile' into style

Conflicts:
	main.c
	src/set_variables.c