Merging Feature_torus into dev

dev branch contains code from Feature_torus, merging these branches will create program that can draw both mesh and torus along with circulant