small settings stuff
Merge branch 'master' of https://github.com/lygood2007/final_pro_cs224
Added lighting and reflection off of particles
Merge resolution