Ignore Makefile
Ignore Gemfile.lock#
Merge branch 'dev' into graphviz