2D working, still seg faulting in cylinder
Merge branch 'master' of github.com:imtibbet/CS351

push b4 pull