added wrap lightning, merged guitar model vertices and computed normals for smooth shading
Merge branch 'development' of https://github.com/Wisheri/dmp-project into development