Compiles now. renamed FlatShader to PhongShader. flatShader to meshShader in main.cpp
Bryan played with PhongShader.h after I fixed it.

Merge branch 'master' of https://github.com/Milez213/CityTrial