Makefile to build exe
Merge branch 'makefile'