Geometry changes
Merge branch 'master' of https://github.com/cfdlab/finalProject

Conflicts:
	main.c
	visual.c
Merge branch 'master' of https://github.com/cfdlab/finalProject