Bump mapped asteroid. Normals are inverted however.
Fixed normals problem.
it just works.
update to instance from one object
* Fixed Phong shading
* Added a green cube to represent second light source
* Removed some deprecated code
Fixed instancing over one external object.
Fixed uninitialized members in copy constructor of external model. Changed shaders to support 3 types of textures: no texture, regular, bump map.
1. finalized bump mapping on Bumps branch
Merge branch 'Bumps'
Fixed merge conflicts, bump map works.
Conflicts:
	StarFaux/StarFaux/ExternalModel.cpp
	StarFaux/StarFaux/ExternalModel.h
	StarFaux/StarFaux/Shape.h
	StarFaux/StarFaux/fshader.glsl
	StarFaux/StarFaux/main.cpp
	StarFaux/StarFaux/main.h
	StarFaux/StarFaux/vshader.glsl
merge lazers + steroids