Makefile correct
Merge branch 'develop' of https://github.com/DeadPixelsSociety/PIRATES into develop