fix Makefile
Merge branch 'master' of github.com:aralejs/overlay
merge conflict