Added a simple Makefile.
Merge remote-tracking branch 'upstream/master'
Merge pull request #36 from joanappardal/master

Makefile