commiting before merging
Merge branch 'master' of https://github.com/ppenzin/junta
cross-platform makefile