fuckin wit matrics
Merge branch 'master' of github.com:mattvisco/fluid_simulation

Conflicts:
	fluid_render
	fluid_render.o
	fluid_simulator.o
	grid.cpp
	grid.o
nonsense
nonsense
stupid merge shit
pressure color map