Things compile, but need to debug (also, seg fault)
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Flow/.Flow.h.swp
Thing compiles. Hopefully this includes the right files. >.>