större vektor
Merge branch 'master' of https://github.com/PutBoy/presentationtemp

Conflicts:
	presentation/main.cpp