Camera controls added
Merge branch 'master' of github.com:johanjoensson/TSBK03-Project

Conflicts:
	src/main.cpp
Merge branch 'master' of github.com:johanjoensson/TSBK03-Project
Merge branch 'master' of github.com:johanjoensson/TSBK03-Project
Fixed diffuse shading, added specular shading