Sync my home PC with Github master (in general, Makefile modded)
Merge branch 'master' of https://github.com/upcFrost/Bikas.git

Conflicts:
	border.o
	debug.o
	functions.o
	globals.o
	interp.o
	main.o
	output.o
	outputDyn.csv
	outputGas.pvd