cleaned up code, removed extra headers etc
Merge branch 'mGL_sync' of https://github.com/Syntaf/ParticleSimulator into mGL_sync