Add vector struct
Merge remote branch 'origin/master'

Conflicts:
	src/renderer.cpp