la till billboardModel(void)
Merge branch 'master' of github.com:hento581/OProject2

Conflicts:
	OProject/Starter.cpp