Fix Makefile for Big Box
Merge branch 'master' of github.com:apajx/Masters-Research