Commit to merge changes
mend
Merge branch 'master', remote-tracking branch 'origin/master'
Fixed display error, enabled lighting+multisampling, and added inner matrix