merging stuff
Merge branch 'master' of github.com:bmatejek525/Graphics

Conflicts:
	src/R3Scene.h
	src/particle.cpp
	src/particleview.cpp