resolved merge issue
have the webcam rendered in playlist-screen
Remove executable bit.
Use properly sized attributes instead of all vec4s.
Remove Line and Square.
VertexArray should not be in glshader.hh.
Object3d::drawVBO is misleading function name.
Merge branch 'master' into danceoverhaul

Conflicts:
	game/screen_playlist.cc
	game/screen_playlist.hh
Fix mismerge.
VBOs are good.

* VertexArray can now optionally use VBO
  --> No more uploading static VA data to GPU each draw call
* Object3d takes advantage of this
Member functions start with lower case in our coding style.
Merge branch 'master' into danceoverhaul