test

from sherry
Merge remote-tracking branch 'origin/Sherry'
Testing OpenGL
Merge branch 'master' of https://github.com/abhinavnair92/MiniPaint
Merge remote-tracking branch 'origin/master' into Joe