gitignore change--rm Makefile
Merge branch 'dev'