Added Makefile.
Changed .gitignore to not ignore Makefile
Merge branch 'makefile' into devel