Added to Makefile and cleaned upp .h and .cc files

Removed Effect include "GameLogic.h"