make now builds static library libcdatastructures.a
Merge branch 'dev'