Merge pull request #2 from agomezl/master

Makefile
Commented code, also changes to coding style (2012 code -> 2014 code)
Commented code, also changes to coding style (2012 code -> 2014 code)
Commented code, also changes to coding style (2012 code -> 2014 code)
quick makefile fix due to folder structure changes