Begun elaborating Makefile
Merge branch 'development'