Started merging branch
Initial merge branch
Works with clang
Mesh merging works properly. Exceeding the memory limits of my laptop now
Added makefile for use on Monch
Updated readme and changed filenames
Two makefiles now
Up to date on monch
Deleted local makefile