Added phong lighting and shadows, fixed a few bugs, updated readme
Merged branch